From 9b42c2b1275e61e4533f59157d4114509d46be55 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 11 May 2015 16:58:58 +0200 Subject: Remove unneeded ResourceContextQt::set_url_request_context_getter This is an ancient relic that can be removed. Change-Id: Ia6926fff65d0e4d0769de940516866a2c51d9a0c Reviewed-by: Allan Sandfeld Jensen --- src/core/browser_context_qt.cpp | 3 +-- src/core/resource_context_qt.cpp | 11 ++--------- src/core/resource_context_qt.h | 5 ----- 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'src/core') diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 3fa0f672d..7f285b1e5 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -78,7 +78,7 @@ bool BrowserContextQt::IsOffTheRecord() const net::URLRequestContextGetter *BrowserContextQt::GetRequestContext() { - return GetDefaultStoragePartition(this)->GetURLRequestContext(); + return url_request_getter_.get(); } net::URLRequestContextGetter *BrowserContextQt::GetRequestContextForRenderProcess(int) @@ -137,7 +137,6 @@ content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate() net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers) { url_request_getter_ = new URLRequestContextGetterQt(m_adapter, protocol_handlers); - static_cast(GetResourceContext())->set_url_request_context_getter(url_request_getter_.get()); return url_request_getter_.get(); } diff --git a/src/core/resource_context_qt.cpp b/src/core/resource_context_qt.cpp index acd8ba4b9..715d92aa2 100644 --- a/src/core/resource_context_qt.cpp +++ b/src/core/resource_context_qt.cpp @@ -44,20 +44,13 @@ namespace QtWebEngineCore { net::HostResolver *ResourceContextQt::GetHostResolver() { - CHECK(getter_); - return getter_->GetURLRequestContext()->host_resolver(); + return GetRequestContext()->host_resolver(); } net::URLRequestContext* ResourceContextQt::GetRequestContext() { - if (getter_) - return getter_->GetURLRequestContext(); + Q_ASSERT(context); return context->GetRequestContext()->GetURLRequestContext(); } -void ResourceContextQt::set_url_request_context_getter(net::URLRequestContextGetter *getter) -{ - getter_ = getter; -} - } // namespace QtWebEngineCore diff --git a/src/core/resource_context_qt.h b/src/core/resource_context_qt.h index 48dc3d583..22bceb8e7 100644 --- a/src/core/resource_context_qt.h +++ b/src/core/resource_context_qt.h @@ -55,18 +55,13 @@ class ResourceContextQt : public content::ResourceContext public: ResourceContextQt(BrowserContextQt *ctx) : context(ctx) - , getter_(0) {} virtual net::HostResolver* GetHostResolver() Q_DECL_OVERRIDE; virtual net::URLRequestContext* GetRequestContext() Q_DECL_OVERRIDE; - - void set_url_request_context_getter(net::URLRequestContextGetter* getter); - private: BrowserContextQt *context; - net::URLRequestContextGetter* getter_; DISALLOW_COPY_AND_ASSIGN(ResourceContextQt); }; -- cgit v1.2.3