Stop using ResourceContext::GetRequestContext in preparation of getting rid of ResourceContext.

After this change there are no more callers. The next cl will remove the implementations of that
method.

Bug: 908955
Change-Id: Ie424e9d6be5d6bb8702962198c61e718968ac2a7
Reviewed-on: https://chromium-review.googlesource.com/c/1352510Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611786}

chrome/browser/extensions/extension_protocols_unittest.cc

@@ -190,14 +190,13 @@ class ExtensionProtocolsTest
   ExtensionProtocolsTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         rvh_test_enabler_(new content::RenderViewHostTestEnabler()),
-        old_factory_(NULL),
-        resource_context_(&test_url_request_context_) {}
+        old_factory_(NULL) {}
 
   void SetUp() override {
     testing::Test::SetUp();
     testing_profile_ = TestingProfile::Builder().Build();
     contents_ = CreateTestWebContents();
-    old_factory_ = resource_context_.GetRequestContext()->job_factory();
+    old_factory_ = test_url_request_context_.job_factory();
 
     // Set up content verification.
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -212,7 +211,7 @@ class ExtensionProtocolsTest
 
   void TearDown() override {
     loader_factory_.reset();
-    resource_context_.GetRequestContext()->set_job_factory(old_factory_);
+    test_url_request_context_.set_job_factory(old_factory_);
     content_verifier_->Shutdown();
   }
 
@@ -226,7 +225,7 @@ class ExtensionProtocolsTest
         job_factory_.SetProtocolHandler(
             kExtensionScheme,
             CreateExtensionProtocolHandler(is_incognito, info_map()));
-        resource_context_.GetRequestContext()->set_job_factory(&job_factory_);
+        test_url_request_context_.set_job_factory(&job_factory_);
         break;
     }
     testing_profile_->ForceIncognito(is_incognito);
@@ -312,12 +311,13 @@ class ExtensionProtocolsTest
   }
 
   GetResult RequestURL(const GURL& url, ResourceType resource_type) {
-    auto request = resource_context_.GetRequestContext()->CreateRequest(
+    auto request = test_url_request_context_.CreateRequest(
         url, net::DEFAULT_PRIORITY, &test_delegate_,
         TRAFFIC_ANNOTATION_FOR_TESTS);
 
     content::ResourceRequestInfo::AllocateForTesting(
-        request.get(), resource_type, &resource_context_,
+        request.get(), resource_type,
+        /* resource_context */nullptr,
         /*render_process_id=*/-1,
         /*render_view_id=*/-1,
         /*render_frame_id=*/-1,
@@ -350,7 +350,6 @@ class ExtensionProtocolsTest
   const net::URLRequestJobFactory* old_factory_;
   std::unique_ptr<network::mojom::URLLoaderFactory> loader_factory_;
   net::TestURLRequestContext test_url_request_context_;
-  content::MockResourceContext resource_context_;
   std::unique_ptr<TestingProfile> testing_profile_;
   net::TestDelegate test_delegate_;
   std::unique_ptr<content::WebContents> contents_;

content/browser/appcache/chrome_appcache_service_unittest.cc

@@ -40,28 +40,6 @@ const char kProtectedManifest[] = "http://www.protected.com/cache.manifest";
 const char kNormalManifest[] = "http://www.normal.com/cache.manifest";
 const char kSessionOnlyManifest[] = "http://www.sessiononly.com/cache.manifest";
 
-class MockURLRequestContextGetter : public net::URLRequestContextGetter {
- public:
-  MockURLRequestContextGetter(
-      net::URLRequestContext* context,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner)
-      : context_(context), task_runner_(std::move(task_runner)) {}
-
-  net::URLRequestContext* GetURLRequestContext() override { return context_; }
-
-  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-      const override {
-    return task_runner_;
-  }
-
- protected:
-  ~MockURLRequestContextGetter() override {}
-
- private:
-  net::URLRequestContext* context_;
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-};
-
 }  // namespace
 
 class ChromeAppCacheServiceTest : public testing::Test {
@@ -101,16 +79,13 @@ ChromeAppCacheServiceTest::CreateAppCacheServiceImpl(
       new MockSpecialStoragePolicy;
   mock_policy->AddProtected(kProtectedManifestURL.GetOrigin());
   mock_policy->AddSessionOnly(kSessionOnlyManifestURL.GetOrigin());
-  scoped_refptr<MockURLRequestContextGetter> mock_request_context_getter =
-      new MockURLRequestContextGetter(
-          browser_context_.GetResourceContext()->GetRequestContext(),
-          base::ThreadTaskRunnerHandle::Get());
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(
           &ChromeAppCacheService::InitializeOnIOThread, appcache_service,
           appcache_path, browser_context_.GetResourceContext(),
-          base::RetainedRef(mock_request_context_getter), mock_policy));
+          base::RetainedRef(browser_context_.GetRequestContext()),
+          mock_policy));
   // Steps needed to initialize the storage of AppCache data.
   scoped_task_environment_.RunUntilIdle();
   if (init_storage) {

content/browser/loader/mojo_async_resource_handler_unittest.cc

@@ -301,7 +301,7 @@ class MojoAsyncResourceHandlerTestBase {
     // Create and initialize |request_|.  None of this matters, for these tests,
     // just need something non-NULL.
     request_context_ =
-        browser_context_->GetResourceContext()->GetRequestContext();
+        browser_context_->GetRequestContext()->GetURLRequestContext();
     request_ = request_context_->CreateRequest(
         GURL("http://foo/"), net::DEFAULT_PRIORITY, &url_request_delegate_,
         TRAFFIC_ANNOTATION_FOR_TESTS);

content/browser/loader/navigation_url_loader_unittest.cc

@@ -64,7 +64,7 @@ class NavigationURLLoaderTest : public testing::Test {
     BrowserContext::EnsureResourceContextInitialized(browser_context_.get());
     base::RunLoop().RunUntilIdle();
     net::URLRequestContext* request_context =
-        browser_context_->GetResourceContext()->GetRequestContext();
+        browser_context_->GetRequestContext()->GetURLRequestContext();
     // Attach URLRequestTestJob.
     job_factory_.SetProtocolHandler(
         "test", net::URLRequestTestJob::CreateProtocolHandler());
@@ -109,7 +109,7 @@ class NavigationURLLoaderTest : public testing::Test {
   std::string FetchURL(const GURL& url) {
     net::TestDelegate delegate;
     net::URLRequestContext* request_context =
-        browser_context_->GetResourceContext()->GetRequestContext();
+        browser_context_->GetRequestContext()->GetURLRequestContext();
     std::unique_ptr<net::URLRequest> request(request_context->CreateRequest(
         url, net::DEFAULT_PRIORITY, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
     request->Start();
@@ -176,8 +176,8 @@ TEST_F(NavigationURLLoaderTest, RequestFailedCertErrorFatal) {
 
   // Set HSTS for the test domain in order to make SSL errors fatal.
   net::TransportSecurityState* transport_security_state =
-      browser_context_->GetResourceContext()
-          ->GetRequestContext()
+      browser_context_->GetRequestContext()
+          ->GetURLRequestContext()
           ->transport_security_state();
   base::Time expiry = base::Time::Now() + base::TimeDelta::FromDays(1000);
   bool include_subdomains = false;

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -532,14 +532,14 @@ bool ResourceDispatcherHostImpl::HandleExternalProtocol(ResourceLoader* loader,
   if (!IsResourceTypeFrame(info->GetResourceType()))
     return false;
 
+  net::URLRequest* url_request = loader->request();
+  DCHECK(url_request);
+
   const net::URLRequestJobFactory* job_factory =
-      info->GetContext()->GetRequestContext()->job_factory();
+      url_request->context()->job_factory();
   if (!url.is_valid() || job_factory->IsHandledProtocol(url.scheme()))
     return false;
 
-  net::URLRequest* url_request = loader->request();
-  DCHECK(url_request);
-
   return GetContentClient()->browser()->HandleExternalProtocol(
       url, info->GetWebContentsGetterForRequest(), info->GetChildID(),
       info->GetNavigationUIData(), info->IsMainFrame(),
@@ -1455,7 +1455,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
       ChildProcessSecurityPolicyImpl::GetInstance();
   bool is_external_protocol =
       info.common_params.url.is_valid() &&
-      !resource_context->GetRequestContext()->job_factory()->IsHandledProtocol(
+      !request_context->job_factory()->IsHandledProtocol(
           info.common_params.url.scheme());
   bool non_web_url_in_guest =
       info.is_for_guests_only &&

content/browser/loader/resource_dispatcher_host_unittest.cc

@@ -121,7 +121,7 @@ static network::ResourceRequest CreateResourceRequest(const char* method,
 // This is used to create a filter matching a specified child id.
 class TestFilterSpecifyingChild : public ResourceMessageFilter {
  public:
-  TestFilterSpecifyingChild(BrowserContext* browser_context, int process_id)
+  TestFilterSpecifyingChild(TestBrowserContext* browser_context, int process_id)
       : ResourceMessageFilter(
             process_id,
             nullptr,
@@ -133,7 +133,8 @@ class TestFilterSpecifyingChild : public ResourceMessageFilter {
             base::Bind(&TestFilterSpecifyingChild::GetContexts,
                        base::Unretained(this)),
             base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO})),
-        resource_context_(browser_context->GetResourceContext()) {
+        resource_context_(browser_context->GetResourceContext()),
+        url_request_context_(browser_context->GetRequestContext()) {
     InitializeForTest();
     set_peer_process_for_testing(base::Process::Current());
   }
@@ -154,17 +155,18 @@ class TestFilterSpecifyingChild : public ResourceMessageFilter {
                    ResourceContext** resource_context,
                    net::URLRequestContext** request_context) {
     *resource_context = resource_context_;
-    *request_context = resource_context_->GetRequestContext();
+    *request_context = url_request_context_->GetURLRequestContext();
   }
 
   ResourceContext* resource_context_;
+  scoped_refptr<net::URLRequestContextGetter> url_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFilterSpecifyingChild);
 };
 
 class TestFilter : public TestFilterSpecifyingChild {
  public:
-  explicit TestFilter(BrowserContext* browser_context)
+  explicit TestFilter(TestBrowserContext* browser_context)
       : TestFilterSpecifyingChild(
             browser_context,
             ChildProcessHostImpl::GenerateChildProcessUniqueId()) {
@@ -675,9 +677,8 @@ class ResourceDispatcherHostTest : public testing::TestWithParam<TestMode> {
     content::RunAllTasksUntilIdle();
 
     filter_ = MakeTestFilter();
-    // TODO(cbentzel): Better way to get URLRequestContext?
     net::URLRequestContext* request_context =
-        browser_context_->GetResourceContext()->GetRequestContext();
+        browser_context_->GetRequestContext()->GetURLRequestContext();
     job_factory_.reset(new TestURLRequestJobFactory(this));
     request_context->set_job_factory(job_factory_.get());
     request_context->set_network_delegate(&network_delegate_);

content/browser/loader/resource_loader_unittest.cc

@@ -387,7 +387,6 @@ class ResourceLoaderTest : public testing::Test,
   ResourceLoaderTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         test_url_request_context_(true),
-        resource_context_(&test_url_request_context_),
         raw_ptr_resource_handler_(nullptr),
         raw_ptr_to_request_(nullptr) {
     test_url_request_context_.set_job_factory(&job_factory_);
@@ -443,7 +442,7 @@ class ResourceLoaderTest : public testing::Test,
 
     RenderFrameHost* rfh = web_contents_->GetMainFrame();
     ResourceRequestInfo::AllocateForTesting(
-        request.get(), resource_type, &resource_context_,
+        request.get(), resource_type, nullptr /* resource_context */,
         rfh->GetProcess()->GetID(), rfh->GetRenderViewHost()->GetRoutingID(),
         rfh->GetRoutingID(), belongs_to_main_frame, true /* allow_download */,
         false /* is_async */, PREVIEWS_OFF /* previews_state */,
@@ -454,12 +453,12 @@ class ResourceLoaderTest : public testing::Test,
     loader_.reset(new ResourceLoader(
         std::move(request),
         WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_),
-        this, &resource_context_, nullptr /* throttling_token */));
+        this, nullptr /* resource_context */, nullptr /* throttling_token */));
   }
 
   void SetUpResourceLoaderForUrl(const GURL& test_url) {
     std::unique_ptr<net::URLRequest> request(
-        resource_context_.GetRequestContext()->CreateRequest(
+        test_url_request_context_.CreateRequest(
             test_url, net::DEFAULT_PRIORITY, nullptr /* delegate */,
             TRAFFIC_ANNOTATION_FOR_TESTS));
     SetUpResourceLoader(std::move(request), RESOURCE_TYPE_MAIN_FRAME, true);
@@ -563,7 +562,6 @@ class ResourceLoaderTest : public testing::Test,
   net::URLRequestJobFactoryImpl job_factory_;
   net::TestNetworkQualityEstimator network_quality_estimator_;
   net::TestURLRequestContext test_url_request_context_;
-  MockResourceContext resource_context_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<TestWebContents> web_contents_;
 
@@ -774,7 +772,7 @@ TEST_F(ClientCertResourceLoaderTest, StoreAsyncCancel) {
 // Tests that a RESOURCE_TYPE_PREFETCH request sets the LOAD_PREFETCH flag.
 TEST_F(ResourceLoaderTest, PrefetchFlag) {
   std::unique_ptr<net::URLRequest> request(
-      resource_context_.GetRequestContext()->CreateRequest(
+      test_url_request_context_.CreateRequest(
           test_async_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */,
           TRAFFIC_ANNOTATION_FOR_TESTS));
   SetUpResourceLoader(std::move(request), RESOURCE_TYPE_PREFETCH, true);
@@ -1578,7 +1576,7 @@ class EffectiveConnectionTypeResourceLoaderTest : public ResourceLoaderTest {
 
     // Start the request and wait for it to finish.
     std::unique_ptr<net::URLRequest> request(
-        resource_context_.GetRequestContext()->CreateRequest(
+        test_url_request_context_.CreateRequest(
             test_redirect_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */,
             TRAFFIC_ANNOTATION_FOR_TESTS));
     SetUpResourceLoader(std::move(request), resource_type,

content/browser/loader/resource_requester_info.cc

@@ -16,6 +16,7 @@
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/navigation_policy.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "services/network/public/cpp/features.h"
 #include "storage/browser/fileapi/file_system_context.h"
 
@@ -25,11 +26,12 @@ namespace {
 
 void GetContextsCallbackForNavigationPreload(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
+    net::URLRequestContext* url_request_context,
     ResourceType resource_type,
     ResourceContext** resource_context_out,
     net::URLRequestContext** request_context_out) {
   *resource_context_out = service_worker_context->resource_context();
-  *request_context_out = (*resource_context_out)->GetRequestContext();
+  *request_context_out = url_request_context;
 }
 
 }  // namespace
@@ -106,7 +108,8 @@ ResourceRequesterInfo::CreateForDownloadOrPageSave(int child_id) {
 
 scoped_refptr<ResourceRequesterInfo>
 ResourceRequesterInfo::CreateForNavigationPreload(
-    ResourceRequesterInfo* original_request_info) {
+    ResourceRequesterInfo* original_request_info,
+    net::URLRequestContext* url_request_context) {
   DCHECK(original_request_info->IsBrowserSideNavigation());
   DCHECK(original_request_info->service_worker_context());
   DCHECK(!original_request_info->get_contexts_callback_);
@@ -116,7 +119,8 @@ ResourceRequesterInfo::CreateForNavigationPreload(
   auto get_contexts_callback =
       base::BindRepeating(&GetContextsCallbackForNavigationPreload,
                           scoped_refptr<ServiceWorkerContextWrapper>(
-                              original_request_info->service_worker_context()));
+                              original_request_info->service_worker_context()),
+                          url_request_context);
 
   return scoped_refptr<ResourceRequesterInfo>(new ResourceRequesterInfo(
       RequesterType::NAVIGATION_PRELOAD, ChildProcessHost::kInvalidUniqueID,

content/browser/loader/resource_requester_info.h

@@ -72,7 +72,8 @@ class CONTENT_EXPORT ResourceRequesterInfo
   // request. When PlzNavigate is enabled, |original_request_info| must be
   // browser side navigation type. Otherwise it must be renderer type.
   static scoped_refptr<ResourceRequesterInfo> CreateForNavigationPreload(
-      ResourceRequesterInfo* original_request_info);
+      ResourceRequesterInfo* original_request_info,
+      net::URLRequestContext* url_request_context);
 
   // Creates a ResourceRequesterInfo for a requester that requests certificates
   // for signed exchange.

content/browser/loader/url_loader_factory_impl_unittest.cc

@@ -46,6 +46,7 @@
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/test/url_request/url_request_slow_download_job.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_filter.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/url_loader_completion_status.h"
@@ -98,7 +99,7 @@ class URLLoaderFactoryImplTest : public ::testing::TestWithParam<size_t> {
         mojo::MakeRequest(&factory_));
 
     // Calling this function creates a request context.
-    browser_context_->GetResourceContext()->GetRequestContext();
+    browser_context_->GetRequestContext()->GetURLRequestContext();
     base::RunLoop().RunUntilIdle();
   }
 
@@ -119,7 +120,7 @@ class URLLoaderFactoryImplTest : public ::testing::TestWithParam<size_t> {
                    net::URLRequestContext** request_context) {
     *resource_context = browser_context_->GetResourceContext();
     *request_context =
-        browser_context_->GetResourceContext()->GetRequestContext();
+        browser_context_->GetRequestContext()->GetURLRequestContext();
   }
 
   // Must outlive all members below.

content/browser/service_worker/service_worker_fetch_dispatcher.cc

@@ -619,7 +619,9 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
   ResourceRequesterInfo* requester_info = original_info->requester_info();
   DCHECK(requester_info->IsBrowserSideNavigation());
   auto url_loader_factory = std::make_unique<URLLoaderFactoryImpl>(
-      ResourceRequesterInfo::CreateForNavigationPreload(requester_info));
+      ResourceRequesterInfo::CreateForNavigationPreload(
+          requester_info,
+          const_cast<net::URLRequestContext*>(original_request->context())));
 
   network::ResourceRequest request;
   request.method = original_request->method();

extensions/browser/content_verify_job_unittest.cc

@@ -47,9 +47,7 @@ enum ContentVerifyJobAsyncRunMode {
 
 class ContentVerifyJobUnittest : public ExtensionsTest {
  public:
-  ContentVerifyJobUnittest()
-      // The TestBrowserThreadBundle is needed for ContentVerifyJob::Start().
-      : resource_context_(&test_url_request_context_) {}
+  ContentVerifyJobUnittest() {}
   ~ContentVerifyJobUnittest() override {}
 
   // Helper to get files from our subdirectory in the general extensions test
@@ -65,18 +63,14 @@ class ContentVerifyJobUnittest : public ExtensionsTest {
     ExtensionsTest::SetUp();
 
     extension_info_map_ = new InfoMap();
-    net::URLRequestContext* request_context =
-        resource_context_.GetRequestContext();
-    old_factory_ = request_context->job_factory();
+    old_factory_ = test_url_request_context_.job_factory();
     content_verifier_ = new ContentVerifier(
         &testing_context_, std::make_unique<MockContentVerifierDelegate>());
     extension_info_map_->SetContentVerifier(content_verifier_.get());
   }
 
   void TearDown() override {
-    net::URLRequestContext* request_context =
-        resource_context_.GetRequestContext();
-    request_context->set_job_factory(old_factory_);
+    test_url_request_context_.set_job_factory(old_factory_);
     content_verifier_->Shutdown();
 
     ExtensionsTest::TearDown();
@@ -167,7 +161,6 @@ class ContentVerifyJobUnittest : public ExtensionsTest {
   net::URLRequestJobFactoryImpl job_factory_;
   const net::URLRequestJobFactory* old_factory_;
   net::TestURLRequestContext test_url_request_context_;
-  content::MockResourceContext resource_context_;
   scoped_refptr<ContentVerifier> content_verifier_;
   content::TestBrowserContext testing_context_;