Commit 9b42c2b1 authored by Andras Becsi's avatar Andras Becsi Committed by Allan Sandfeld Jensen
Browse files

Remove unneeded ResourceContextQt::set_url_request_context_getter


This is an ancient relic that can be removed.

Change-Id: Ia6926fff65d0e4d0769de940516866a2c51d9a0c
Reviewed-by: default avatarAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Showing with 3 additions and 16 deletions
...@@ -78,7 +78,7 @@ bool BrowserContextQt::IsOffTheRecord() const ...@@ -78,7 +78,7 @@ bool BrowserContextQt::IsOffTheRecord() const
net::URLRequestContextGetter *BrowserContextQt::GetRequestContext() net::URLRequestContextGetter *BrowserContextQt::GetRequestContext()
{ {
return GetDefaultStoragePartition(this)->GetURLRequestContext(); return url_request_getter_.get();
} }
net::URLRequestContextGetter *BrowserContextQt::GetRequestContextForRenderProcess(int) net::URLRequestContextGetter *BrowserContextQt::GetRequestContextForRenderProcess(int)
...@@ -137,7 +137,6 @@ content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate() ...@@ -137,7 +137,6 @@ content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate()
net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers) net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers)
{ {
url_request_getter_ = new URLRequestContextGetterQt(m_adapter, protocol_handlers); url_request_getter_ = new URLRequestContextGetterQt(m_adapter, protocol_handlers);
static_cast<ResourceContextQt*>(GetResourceContext())->set_url_request_context_getter(url_request_getter_.get());
return url_request_getter_.get(); return url_request_getter_.get();
} }
......
...@@ -44,20 +44,13 @@ namespace QtWebEngineCore { ...@@ -44,20 +44,13 @@ namespace QtWebEngineCore {
net::HostResolver *ResourceContextQt::GetHostResolver() net::HostResolver *ResourceContextQt::GetHostResolver()
{ {
CHECK(getter_); return GetRequestContext()->host_resolver();
return getter_->GetURLRequestContext()->host_resolver();
} }
net::URLRequestContext* ResourceContextQt::GetRequestContext() net::URLRequestContext* ResourceContextQt::GetRequestContext()
{ {
if (getter_) Q_ASSERT(context);
return getter_->GetURLRequestContext();
return context->GetRequestContext()->GetURLRequestContext(); return context->GetRequestContext()->GetURLRequestContext();
} }
void ResourceContextQt::set_url_request_context_getter(net::URLRequestContextGetter *getter)
{
getter_ = getter;
}
} // namespace QtWebEngineCore } // namespace QtWebEngineCore
...@@ -55,18 +55,13 @@ class ResourceContextQt : public content::ResourceContext ...@@ -55,18 +55,13 @@ class ResourceContextQt : public content::ResourceContext
public: public:
ResourceContextQt(BrowserContextQt *ctx) ResourceContextQt(BrowserContextQt *ctx)
: context(ctx) : context(ctx)
, getter_(0)
{} {}
virtual net::HostResolver* GetHostResolver() Q_DECL_OVERRIDE; virtual net::HostResolver* GetHostResolver() Q_DECL_OVERRIDE;
virtual net::URLRequestContext* GetRequestContext() Q_DECL_OVERRIDE; virtual net::URLRequestContext* GetRequestContext() Q_DECL_OVERRIDE;
void set_url_request_context_getter(net::URLRequestContextGetter* getter);
private: private:
BrowserContextQt *context; BrowserContextQt *context;
net::URLRequestContextGetter* getter_;
DISALLOW_COPY_AND_ASSIGN(ResourceContextQt); DISALLOW_COPY_AND_ASSIGN(ResourceContextQt);
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment