Remove ResourceContext::GetRequestContext since it's no longer used.

Also remove a bunch of usages of MockResourceContext that are no longer needed.

Bug: 908955
Change-Id: I3485595c83ef8e22f245c22c97775845c5e0e7fc
Reviewed-on: https://chromium-review.googlesource.com/c/1352035Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611852}

android_webview/browser/aw_browser_context.cc

@@ -220,8 +220,7 @@ bool AwBrowserContext::IsOffTheRecord() const {
 
 content::ResourceContext* AwBrowserContext::GetResourceContext() {
   if (!resource_context_) {
-    resource_context_.reset(
-        new AwResourceContext(url_request_context_getter_.get()));
+    resource_context_.reset(new AwResourceContext);
   }
   return resource_context_.get();
 }

android_webview/browser/aw_resource_context.cc

@@ -12,9 +12,7 @@ using content::BrowserThread;
 
 namespace android_webview {
 
-AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter)
-    : getter_(getter) {
-  DCHECK(getter_);
+AwResourceContext::AwResourceContext() {
 }
 
 AwResourceContext::~AwResourceContext() {
@@ -40,9 +38,4 @@ std::string AwResourceContext::GetExtraHeaders(const GURL& url) {
   return iter != extra_headers_.end() ? iter->second : std::string();
 }
 
-net::URLRequestContext* AwResourceContext::GetRequestContext() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  return getter_->GetURLRequestContext();
-}
-
 }  // namespace android_webview

android_webview/browser/aw_resource_context.h

@@ -14,26 +14,17 @@
 
 class GURL;
 
-namespace net {
-class URLRequestContextGetter;
-}
-
 namespace android_webview {
 
 class AwResourceContext : public content::ResourceContext {
  public:
-  explicit AwResourceContext(net::URLRequestContextGetter* getter);
+  AwResourceContext();
   ~AwResourceContext() override;
 
   void SetExtraHeaders(const GURL& url, const std::string& headers);
   std::string GetExtraHeaders(const GURL& url);
 
-  // content::ResourceContext implementation.
-  net::URLRequestContext* GetRequestContext() override;
-
  private:
-  net::URLRequestContextGetter* getter_;
-
   base::Lock extra_headers_lock_;
   std::map<std::string, std::string> extra_headers_;
 

chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc

@@ -52,8 +52,7 @@ namespace data_use_measurement {
 class ChromeDataUseAscriberTest : public testing::Test {
  protected:
   ChromeDataUseAscriberTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-        resource_context_(new content::MockResourceContext(&context_)) {}
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void SetUp() override {}
 
@@ -71,10 +70,6 @@ class ChromeDataUseAscriberTest : public testing::Test {
 
   net::TestURLRequestContext* context() { return &context_; }
 
-  content::MockResourceContext* resource_context() {
-    return resource_context_.get();
-  }
-
   ChromeDataUseAscriber* ascriber() { return ascriber_.get(); }
 
   std::unique_ptr<net::URLRequest> CreateNewRequest(std::string url,
@@ -89,7 +84,7 @@ class ChromeDataUseAscriberTest : public testing::Test {
         request.get(),
         is_main_frame ? content::RESOURCE_TYPE_MAIN_FRAME
                       : content::RESOURCE_TYPE_SCRIPT,
-        resource_context(), render_process_id,
+        /*resource_context*/nullptr, render_process_id,
         /*render_view_id=*/-1, render_frame_id, is_main_frame,
         /*allow_download=*/false,
         /*is_async=*/true, content::PREVIEWS_OFF,
@@ -101,7 +96,6 @@ class ChromeDataUseAscriberTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<ChromeDataUseAscriber> ascriber_;
   net::TestURLRequestContext context_;
-  std::unique_ptr<content::MockResourceContext> resource_context_;
 };
 
 TEST_F(ChromeDataUseAscriberTest, NoRecorderWithoutFrame) {

chrome/browser/extensions/extension_protocols_unittest.cc

@@ -25,7 +25,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/previews_state.h"
-#include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"

chrome/browser/profiles/profile_io_data.cc

@@ -899,19 +899,12 @@ void ProfileIOData::set_data_reduction_proxy_io_data(
 }
 
 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data)
-    : io_data_(io_data),
-      request_context_(NULL) {
+    : io_data_(io_data) {
   DCHECK(io_data);
 }
 
 ProfileIOData::ResourceContext::~ResourceContext() {}
 
-net::URLRequestContext* ProfileIOData::ResourceContext::GetRequestContext()  {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(io_data_->initialized_);
-  return request_context_;
-}
-
 void ProfileIOData::Init(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) const {
@@ -1062,8 +1055,6 @@ void ProfileIOData::Init(
             std::move(profile_params_->main_network_context_request),
             std::move(profile_params_->main_network_context_params),
             std::move(builder), &main_request_context_);
-
-    resource_context_->request_context_ = main_request_context_;
   }
 
   OnMainRequestContextCreated(profile_params_.get());

chrome/browser/profiles/profile_io_data.h

@@ -431,15 +431,10 @@ class ProfileIOData {
     explicit ResourceContext(ProfileIOData* io_data);
     ~ResourceContext() override;
 
-    // ResourceContext implementation:
-    net::URLRequestContext* GetRequestContext() override;
-
    private:
     friend class ProfileIOData;
 
     ProfileIOData* const io_data_;
-
-    net::URLRequestContext* request_context_;
   };
 
   typedef std::map<StoragePartitionDescriptor,

chrome/browser/search/iframe_source_unittest.cc

@@ -74,7 +74,6 @@ class IframeSourceTest : public testing::Test {
   // those constraints.
   IframeSourceTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-        resource_context_(&test_url_request_context_),
         instant_io_context_(NULL),
         response_(NULL) {
   }

chromecast/browser/cast_browser_context.cc

@@ -32,27 +32,17 @@ const void* const kDownloadManagerDelegateKey = &kDownloadManagerDelegateKey;
 class CastBrowserContext::CastResourceContext :
     public content::ResourceContext {
  public:
-  explicit CastResourceContext(
-      URLRequestContextFactory* url_request_context_factory) :
-    url_request_context_factory_(url_request_context_factory) {}
+  CastResourceContext() {}
   ~CastResourceContext() override {}
 
-  // ResourceContext implementation:
-  net::URLRequestContext* GetRequestContext() override {
-    return url_request_context_factory_->GetMainGetter()->
-        GetURLRequestContext();
-  }
-
  private:
-  URLRequestContextFactory* url_request_context_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(CastResourceContext);
 };
 
 CastBrowserContext::CastBrowserContext(
     URLRequestContextFactory* url_request_context_factory)
     : url_request_context_factory_(url_request_context_factory),
-      resource_context_(new CastResourceContext(url_request_context_factory)) {
+      resource_context_(new CastResourceContext) {
   InitWhileIOAllowed();
 }
 

content/browser/appcache/chrome_appcache_service_unittest.cc

@@ -19,7 +19,6 @@
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/appcache_test_helper.h"

content/browser/loader/resource_loader_unittest.cc

@@ -27,7 +27,6 @@
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/resource_type.h"
-#include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_renderer_host.h"

content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc

@@ -24,7 +24,6 @@
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/common/resource_type.h"
-#include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/test_content_browser_client.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
@@ -76,8 +75,7 @@ class ServiceWorkerControlleeRequestHandlerTest
           job_(nullptr) {}
 
     ServiceWorkerURLRequestJob* MaybeCreateJob() {
-      job_.reset(handler_->MaybeCreateJob(request_.get(), nullptr,
-                                          &test_->mock_resource_context_));
+      job_.reset(handler_->MaybeCreateJob(request_.get(), nullptr, nullptr));
       return static_cast<ServiceWorkerURLRequestJob*>(job_.get());
     }
 
@@ -86,8 +84,7 @@ class ServiceWorkerControlleeRequestHandlerTest
       resource_request.url = request_->url();
       resource_request.resource_type = resource_type_;
       resource_request.headers = request()->extra_request_headers();
-      handler_->MaybeCreateLoader(resource_request,
-                                  &test_->mock_resource_context_,
+      handler_->MaybeCreateLoader(resource_request, nullptr,
                                   base::DoNothing(), base::DoNothing());
     }
 
@@ -200,7 +197,6 @@ class ServiceWorkerControlleeRequestHandlerTest
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
   net::URLRequestContext url_request_context_;
   net::TestDelegate url_request_delegate_;
-  MockResourceContext mock_resource_context_;
   GURL scope_;
   GURL script_url_;
   std::vector<ServiceWorkerRemoteProviderEndpoint> remote_endpoints_;

content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc

@@ -22,7 +22,6 @@
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_test_utils.h"
 #include "content/common/service_worker/service_worker_utils.h"
-#include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
@@ -187,8 +186,7 @@ class MockHttpProtocolHandler
       base::RepeatingCallback<net::URLRequestJob*(net::URLRequest*,
                                                   net::NetworkDelegate*)>;
 
-  explicit MockHttpProtocolHandler(ResourceContext* resource_context)
-      : resource_context_(resource_context) {}
+  MockHttpProtocolHandler() {}
   ~MockHttpProtocolHandler() override {}
 
   net::URLRequestJob* MaybeCreateJob(
@@ -197,8 +195,7 @@ class MockHttpProtocolHandler
     ServiceWorkerRequestHandler* handler =
         ServiceWorkerRequestHandler::GetHandler(request);
     if (handler) {
-      return handler->MaybeCreateJob(
-          request, network_delegate, resource_context_);
+      return handler->MaybeCreateJob(request, network_delegate, nullptr);
     }
     return create_job_callback_.Run(request, network_delegate);
   }
@@ -207,7 +204,6 @@ class MockHttpProtocolHandler
   }
 
  private:
-  ResourceContext* resource_context_;
   JobCallback create_job_callback_;
 };
 
@@ -309,7 +305,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
 
     url_request_context_.reset(new net::URLRequestContext);
-    mock_protocol_handler_ = new MockHttpProtocolHandler(&resource_context_);
+    mock_protocol_handler_ = new MockHttpProtocolHandler;
     url_request_job_factory_.reset(new net::URLRequestJobFactoryImpl);
     url_request_job_factory_->SetProtocolHandler(
         "https", base::WrapUnique(mock_protocol_handler_));
@@ -443,7 +439,6 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
   MockHttpProtocolHandler* mock_protocol_handler_;
 
   storage::BlobStorageContext blob_storage_context_;
-  content::MockResourceContext resource_context_;
   ServiceWorkerRemoteProviderEndpoint remote_endpoint_;
 
   net::TestDelegate url_request_delegate_;

content/public/browser/resource_context.h

@@ -8,10 +8,6 @@
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 
-namespace net {
-class URLRequestContext;
-}
-
 namespace content {
 
 // ResourceContext contains the relevant context information required for
@@ -22,11 +18,6 @@ class CONTENT_EXPORT ResourceContext : public base::SupportsUserData {
  public:
   ResourceContext();
   ~ResourceContext() override;
-
-  // DEPRECATED: This is no longer a valid given isolated apps/sites and
-  // storage partitioning. This getter returns the default context associated
-  // with a BrowsingContext.
-  virtual net::URLRequestContext* GetRequestContext() = 0;
 };
 
 }  // namespace content

content/public/test/mock_resource_context.cc

@@ -4,22 +4,10 @@
 
 #include "content/public/test/mock_resource_context.h"
 
-#include "net/url_request/url_request_context.h"
-
 namespace content {
 
-MockResourceContext::MockResourceContext() : test_request_context_(nullptr) {}
-
-MockResourceContext::MockResourceContext(
-    net::URLRequestContext* test_request_context)
-  : test_request_context_(test_request_context) {
-}
+MockResourceContext::MockResourceContext() {}
 
 MockResourceContext::~MockResourceContext() {}
 
-net::URLRequestContext* MockResourceContext::GetRequestContext()  {
-  CHECK(test_request_context_);
-  return test_request_context_;
-}
-
 }  // namespace content

content/public/test/mock_resource_context.h

@@ -11,27 +11,15 @@
 #include "base/macros.h"
 #include "content/public/browser/resource_context.h"
 
-namespace net {
-class URLRequestContext;
-}
-
 namespace content {
 
 class MockResourceContext : public ResourceContext {
  public:
   MockResourceContext();
 
-  // Does not take ownership of |test_request_context|.
-  explicit MockResourceContext(net::URLRequestContext* test_request_context);
-
   ~MockResourceContext() override;
 
-  // ResourceContext implementation:
-  net::URLRequestContext* GetRequestContext() override;
-
  private:
-  net::URLRequestContext* test_request_context_;
-
   DISALLOW_COPY_AND_ASSIGN(MockResourceContext);
 };
 

content/public/test/test_browser_context.cc

@@ -114,8 +114,7 @@ DownloadManagerDelegate* TestBrowserContext::GetDownloadManagerDelegate() {
 
 ResourceContext* TestBrowserContext::GetResourceContext() {
   if (!resource_context_)
-    resource_context_.reset(new MockResourceContext(
-        GetRequestContext()->GetURLRequestContext()));
+    resource_context_.reset(new MockResourceContext);
   return resource_context_.get();
 }
 

content/shell/browser/shell_browser_context.cc

@@ -38,18 +38,11 @@
 
 namespace content {
 
-ShellBrowserContext::ShellResourceContext::ShellResourceContext()
-    : getter_(nullptr) {}
+ShellBrowserContext::ShellResourceContext::ShellResourceContext() {}
 
 ShellBrowserContext::ShellResourceContext::~ShellResourceContext() {
 }
 
-net::URLRequestContext*
-ShellBrowserContext::ShellResourceContext::GetRequestContext() {
-  CHECK(getter_);
-  return getter_->GetURLRequestContext();
-}
-
 ShellBrowserContext::ShellBrowserContext(bool off_the_record,
                                          net::NetLog* net_log,
                                          bool delay_services_creation)
@@ -176,7 +169,6 @@ net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
   DCHECK(!url_request_getter_.get());
   url_request_getter_ = CreateURLRequestContextGetter(
       protocol_handlers, std::move(request_interceptors));
-  resource_context_->set_url_request_context_getter(url_request_getter_.get());
   return url_request_getter_.get();
 }
 

content/shell/browser/shell_browser_context.h

@@ -82,16 +82,7 @@ class ShellBrowserContext : public BrowserContext {
     ShellResourceContext();
     ~ShellResourceContext() override;
 
-    // ResourceContext implementation:
-    net::URLRequestContext* GetRequestContext() override;
-
-    void set_url_request_context_getter(ShellURLRequestContextGetter* getter) {
-      getter_ = getter;
-    }
-
   private:
-    ShellURLRequestContextGetter* getter_;
-
     DISALLOW_COPY_AND_ASSIGN(ShellResourceContext);
   };
 

extensions/browser/content_verify_job_unittest.cc

@@ -10,7 +10,6 @@
 #include "base/version.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/browser/content_verifier.h"

extensions/shell/browser/shell_browser_context.cc

@@ -70,8 +70,6 @@ net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
           {content::BrowserThread::IO}),
       protocol_handlers, std::move(request_interceptors), nullptr /* net_log */,
       extension_info_map));
-  resource_context_->set_url_request_context_getter(
-      url_request_context_getter());
   base::PostTaskWithTraits(
       FROM_HERE, {content::BrowserThread::IO},
       base::Bind(&ShellBrowserContext::InitURLRequestContextOnIOThread,

headless/lib/browser/headless_request_context_manager.cc

@@ -93,23 +93,7 @@ class HeadlessResourceContext : public content::ResourceContext {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   }
 
-  // ResourceContext implementation:
-  net::URLRequestContext* GetRequestContext() override {
-    CHECK(url_request_context_getter_);
-    return url_request_context_getter_->GetURLRequestContext();
-  }
-
-  // Configure the URL request context getter to be used for resource fetching.
-  // Must be called before any of the other methods of this class are used.
-  void set_url_request_context_getter(
-      scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-    url_request_context_getter_ = std::move(url_request_context_getter);
-  }
-
  private:
-  scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-
   DISALLOW_COPY_AND_ASSIGN(HeadlessResourceContext);
 };
 
@@ -337,8 +321,6 @@ HeadlessRequestContextManager::url_request_context_getter() {
 void HeadlessRequestContextManager::Initialize() {
   url_request_context_getter_ =
       base::MakeRefCounted<HeadlessURLRequestContextGetter>(io_task_runner_);
-  resource_context_->set_url_request_context_getter(
-      url_request_context_getter_);
   if (!network_context_) {
     DCHECK(!network_context_request_);
     network_context_request_ = mojo::MakeRequest(&network_context_);

webrunner/browser/webrunner_browser_context.cc

@@ -30,20 +30,7 @@ class WebRunnerBrowserContext::ResourceContext
   ResourceContext() = default;
   ~ResourceContext() override = default;
 
-  // ResourceContext implementation.
-  net::URLRequestContext* GetRequestContext() override {
-    DCHECK(getter_);
-    return getter_->GetURLRequestContext();
-  }
-
-  void set_url_request_context_getter(
-      scoped_refptr<WebRunnerURLRequestContextGetter> getter) {
-    getter_ = std::move(getter);
-  }
-
  private:
-  scoped_refptr<WebRunnerURLRequestContextGetter> getter_;
-
   DISALLOW_COPY_AND_ASSIGN(ResourceContext);
 };
 
@@ -157,7 +144,6 @@ net::URLRequestContextGetter* WebRunnerBrowserContext::CreateRequestContext(
           {content::BrowserThread::IO}),
       net_log_.get(), std::move(*protocol_handlers),
       std::move(request_interceptors), data_dir_path_);
-  resource_context_->set_url_request_context_getter(url_request_getter_);
   return url_request_getter_.get();
 }