Revert of Simplify BrowserContext by removing redundant methods.

content/browser/devtools/shared_worker_devtools_manager_unittest.cc

 // Copyright 2014 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/devtools/shared_worker_devtools_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/devtools/devtools_agent_host_impl.h"
 #include "content/browser/devtools/shared_worker_devtools_agent_host.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/browser/shared_worker/worker_storage_partition.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_context.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
 class TestDevToolsClientHost : public DevToolsAgentHostClient {
  public:
   TestDevToolsClientHost() {}
   ~TestDevToolsClientHost() override {}
   void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
@@ skipping 11 matching lines @@
   scoped_refptr<DevToolsAgentHost> agent_host_;
   DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost);
 };
 }  // namespace
 
 class SharedWorkerDevToolsManagerTest : public testing::Test {
  public:
   typedef SharedWorkerDevToolsAgentHost::WorkerState WorkerState;
 
   SharedWorkerDevToolsManagerTest()
-      : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
+      : ui_thread_(BrowserThread::UI, &message_loop_),
         browser_context_(new TestBrowserContext()),
-        partition_(new WorkerStoragePartition(
-            BrowserContext::GetDefaultStoragePartition(browser_context_.get())->
-                GetURLRequestContext(),
-            NULL,
-            NULL,
-            NULL,
-            NULL,
-            NULL,
-            NULL,
-            NULL)),
+        partition_(
+            new WorkerStoragePartition(browser_context_->GetRequestContext(),
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL)),
         partition_id_(*partition_.get()) {}
 
  protected:
   void SetUp() override {
     manager_ = SharedWorkerDevToolsManager::GetInstance();
   }
   void TearDown() override {
     SharedWorkerDevToolsManager::GetInstance()->ResetForTesting();
   }
 
@@ skipping 11 matching lines @@
   void CheckWorkerNotExist(int worker_process_id, int worker_route_id) {
     const SharedWorkerDevToolsManager::WorkerId id(worker_process_id,
                                                      worker_route_id);
     EXPECT_TRUE(manager_->workers_.end() == manager_->workers_.find(id));
   }
 
   void CheckWorkerCount(size_t size) {
     EXPECT_EQ(size, manager_->workers_.size());
   }
 
-  TestBrowserThreadBundle browser_thread_bundle_;
+  base::MessageLoopForIO message_loop_;
+  BrowserThreadImpl ui_thread_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<WorkerStoragePartition> partition_;
   const WorkerStoragePartitionId partition_id_;
   SharedWorkerDevToolsManager* manager_;
 };
 
 TEST_F(SharedWorkerDevToolsManagerTest, BasicTest) {
   scoped_refptr<DevToolsAgentHostImpl> agent_host;
 
   SharedWorkerInstance instance1(
@@ skipping 187 matching lines @@
   manager_->WorkerCreated(3, 2, instance);
   CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED);
   agent_host = NULL;
   CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED);
   manager_->WorkerDestroyed(3, 2);
   CheckWorkerNotExist(3, 2);
   CheckWorkerCount(0);
 }
 
 }  // namespace content