Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome_frame/test/net/fake_external_tab.cc

 // Copyright (c) 2011 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 "chrome_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
@@ skipping 581 matching lines @@
 }
 
 void CFUrlRequestUnittestRunner::PreEarlyInitialization() {
   testing::InitGoogleTest(&g_argc, g_argv);
   FilterDisabledTests();
 }
 
 void CFUrlRequestUnittestRunner::PreCreateThreads() {
   fake_chrome_.reset(new FakeExternalTab());
   fake_chrome_->Initialize();
+  fake_chrome_->browser_process()->PreCreateThreads();
 
   pss_subclass_.reset(new ProcessSingletonSubclass(this));
   EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_->user_data()));
   StartChromeFrameInHostBrowser();
 }
 
-void CFUrlRequestUnittestRunner::PreStartThread(BrowserThread::ID identifier) {
-  fake_chrome_->browser_process()->PreStartThread(identifier);
-}
-
-void CFUrlRequestUnittestRunner::PostStartThread(BrowserThread::ID identifier) {
-  fake_chrome_->browser_process()->PostStartThread(identifier);
-}
-
 void CFUrlRequestUnittestRunner::PreMainMessageLoopRun() {
   fake_chrome_->InitializePostThreadsCreated();
 }
 
 bool CFUrlRequestUnittestRunner::MainMessageLoopRun(int* result_code) {
   DCHECK(MessageLoop::current());
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
 
   // We need to allow IO on the main thread for these tests.
   base::ThreadRestrictions::SetIOAllowed(true);
 
   return false;
 }
 
 void CFUrlRequestUnittestRunner::PostMainMessageLoopRun() {
   fake_chrome_->browser_process()->StartTearDown();
 
   // Must do this separately as the mock profile_manager_ is not the
   // same member as BrowserProcessImpl::StartTearDown resets.
   fake_chrome_->browser_process()->DestroyProfileManager();
 
   if (crash_service_)
     base::KillProcess(crash_service_, 0, false);
 
   base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
   base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
 }
 
-void CFUrlRequestUnittestRunner::PreStopThread(
-    content::BrowserThread::ID identifier) {
-  fake_chrome_->browser_process()->PreStopThread(identifier);
-}
-
-void CFUrlRequestUnittestRunner::PostStopThread(
-    content::BrowserThread::ID identifier) {
-  fake_chrome_->browser_process()->PostStopThread(identifier);
-}
-
 void CFUrlRequestUnittestRunner::PostDestroyThreads() {
+  fake_chrome_->browser_process()->PostDestroyThreads();
   fake_chrome_->Shutdown();
   fake_chrome_.reset();
 
 #ifndef NDEBUG
   // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
   // check if globals are created and destroyed on the same thread don't fire.
   // Webkit global objects are created on the inproc renderer thread.
   ExitProcess(test_result());
 #endif
 }
@@ skipping 82 matching lines @@
   // content::InitializeSandboxInfo(&sandbox_info);
   FakeMainDelegate delegate;
   content::ContentMain(
       reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
       &sandbox_info,
       &delegate);
 
   // Note:  In debug builds, we ExitProcess during PostDestroyThreads.
   return g_test_suite->test_result();
 }