Reduce/remove usage of BrowserThread in content/browser/loader.

content/browser/loader/url_loader_factory_impl_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/url_loader_factory_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 63 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(RejectingResourceDispatcherHostDelegate);
 };
 
 // The test parameter is the number of bytes allocated for the buffer in the
 // data pipe, for testing the case where the allocated size is smaller than the
 // size the mime sniffer *implicitly* requires.
 class URLLoaderFactoryImplTest : public ::testing::TestWithParam<size_t> {
  public:
   URLLoaderFactoryImplTest()
-      : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
+      : thread_bundle_(
+            new TestBrowserThreadBundle(TestBrowserThreadBundle::IO_MAINLOOP)),
         browser_context_(new TestBrowserContext()),
         resource_message_filter_(new ResourceMessageFilter(
             kChildId,
             nullptr,
             nullptr,
             nullptr,
             nullptr,
             base::Bind(&URLLoaderFactoryImplTest::GetContexts,
                        base::Unretained(this)))) {
     // Some tests specify request.report_raw_headers, but the RDH checks the
@@ skipping 18 matching lines @@
   ~URLLoaderFactoryImplTest() override {
     ChildProcessSecurityPolicyImpl::GetInstance()->Remove(kChildId);
     rdh_.SetDelegate(nullptr);
     net::URLRequestFilter::GetInstance()->ClearHandlers();
 
     resource_message_filter_->OnChannelClosing();
     rdh_.CancelRequestsForProcess(resource_message_filter_->child_id());
     base::RunLoop().RunUntilIdle();
     MojoAsyncResourceHandler::SetAllocationSizeForTesting(
         MojoAsyncResourceHandler::kDefaultAllocationSize);
+    thread_bundle_.reset(nullptr);
   }
 
   void GetContexts(ResourceType resource_type,
                    ResourceContext** resource_context,
                    net::URLRequestContext** request_context) {
     *resource_context = browser_context_->GetResourceContext();
     *request_context =
         browser_context_->GetResourceContext()->GetRequestContext();
   }
 
-  TestBrowserThreadBundle thread_bundle_;
+  std::unique_ptr<TestBrowserThreadBundle> thread_bundle_;

[ananta, 2017/03/29 19:41:04]

This change was required to ensure that the thread bundle gets destroyed
before the other members of this class like ResourceDispatcherHostImpl, etc. Not
doing this causes dchecks to fire in the code due to a null LoaderGlobals
instance.

   LoaderDelegateImpl loader_deleate_;
   ResourceDispatcherHostImpl rdh_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   scoped_refptr<ResourceMessageFilter> resource_message_filter_;
   mojom::URLLoaderFactoryPtr factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryImplTest);
 };
 
 TEST_P(URLLoaderFactoryImplTest, GetResponse) {
@@ skipping 405 matching lines @@
   ASSERT_FALSE(rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId)));
 }
 
 INSTANTIATE_TEST_CASE_P(URLLoaderFactoryImplTest,
                         URLLoaderFactoryImplTest,
                         ::testing::Values(128, 32 * 1024));
 
 }  // namespace
 
 }  // namespace content