Move ExtensionsProcessManager to src/extensions, part 2

chrome/test/base/chrome_test_suite.cc

 // Copyright (c) 2012 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/test/base/chrome_test_suite.h"
 
 #if defined(OS_CHROMEOS)
 #include <stdio.h>
 #include <unistd.h>
 #endif
@@ skipping 75 matching lines @@
 
 class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
  public:
   ChromeTestSuiteInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     DCHECK(!g_browser_process);
     g_browser_process = new TestingBrowserProcess;
 
+    SetUpContentClients();
+    SetUpExtensionsClients();
+  }
+
+  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+    TearDownExtensionsClients();
+    TearDownContentClients();

[James Cook, 2013/11/01 20:53:12]

This teardown has no significant side effects, so I moved it before the
g_browser_process cleanup to mirror the initialization order.

+
+    if (g_browser_process) {
+      BrowserProcess* browser_process = g_browser_process;
+      // g_browser_process must be NULL during its own destruction.
+      g_browser_process = NULL;
+      delete browser_process;
+    }
+  }
+
+ private:
+  void SetUpContentClients() {
     content_client_.reset(new chrome::ChromeContentClient);
     content::SetContentClient(content_client_.get());
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
     content::SetBrowserClientForTesting(browser_content_client_.get());
     utility_content_client_.reset(new chrome::ChromeContentUtilityClient());
     content::SetUtilityClientForTesting(utility_content_client_.get());
 #endif
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
-    if (g_browser_process) {
-      BrowserProcess* browser_process = g_browser_process;
-      // g_browser_process must be NULL during its own destruction.
-      g_browser_process = NULL;
-      delete browser_process;
-    }
-
+  void TearDownContentClients() {
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset();
     utility_content_client_.reset();
 #endif
     content_client_.reset();
     content::SetContentClient(NULL);
   }
 
- private:
+  void SetUpExtensionsClients() {
+#if defined(ENABLE_EXTENSIONS)
+    extensions_browser_client_.reset(
+        new extensions::ChromeExtensionsBrowserClient);
+    extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());

[James Cook, 2013/11/01 20:53:12]

This must be done after content is initialized because it now registers for
notifications.

+#endif
+  }
+
+  void TearDownExtensionsClients() {
+#if defined(ENABLE_EXTENSIONS)
+    extensions_browser_client_.reset();
+    extensions::ExtensionsBrowserClient::Set(NULL);
+#endif
+  }
+
+  // Client implementations for the content module.
   scoped_ptr<chrome::ChromeContentClient> content_client_;
   // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
   scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_;
   scoped_ptr<chrome::ChromeContentUtilityClient> utility_content_client_;
 #endif
 
+  // Client implementations for the extensions module.
+  scoped_ptr<extensions::ChromeExtensionsBrowserClient>
+      extensions_browser_client_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteInitializer);
 };
 
 }  // namespace
 
 ChromeTestSuite::ChromeTestSuite(int argc, char** argv)
     : content::ContentTestSuiteBase(argc, argv) {
 }
 
 ChromeTestSuite::~ChromeTestSuite() {
@@ skipping 23 matching lines @@
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);
     PathService::Override(base::DIR_MODULE, browser_dir_);
   }
 
 #if !defined(OS_IOS)
   extensions::RegisterPathProvider();
 
   extensions::ExtensionsClient::Set(
       extensions::ChromeExtensionsClient::GetInstance());
-  extensions::ExtensionsBrowserClient::Set(
-      extensions::ChromeExtensionsBrowserClient::GetInstance());
 
   // Only want to do this for unit tests.
   if (!content::GetCurrentTestLauncherDelegate()) {
     // For browser tests, this won't create the right object since
     // TestChromeWebUIControllerFactory is used. That's created and
     // registered in ChromeBrowserMainParts as in normal startup.
     content::WebUIControllerFactory::RegisterFactory(
         ChromeWebUIControllerFactory::GetInstance());
   }
 #endif
@@ skipping 51 matching lines @@
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }