Index: chrome/test/base/testing_browser_process.cc |
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc |
index ebcfa8056b0054ca0a53c93766d88332b88f129b..0a0aff76006ba70102c8ddaf94e0e2efabdfd306 100644 |
--- a/chrome/test/base/testing_browser_process.cc |
+++ b/chrome/test/base/testing_browser_process.cc |
@@ -8,11 +8,9 @@ |
#include "base/strings/string_util.h" |
#include "base/time/default_tick_clock.h" |
#include "build/build_config.h" |
-#include "chrome/browser/apps/chrome_apps_client.h" |
#include "chrome/browser/background/background_mode_manager.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/browser_process_impl.h" |
-#include "chrome/browser/extensions/chrome_extensions_browser_client.h" |
#include "chrome/browser/printing/print_job_manager.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/test/base/testing_browser_process_platform_part.h" |
@@ -40,6 +38,11 @@ |
#include "components/policy/core/common/policy_service_stub.h" |
#endif // defined(ENABLE_CONFIGURATION_POLICY) |
+#if defined(ENABLE_EXTENSIONS) |
+#include "chrome/browser/apps/chrome_apps_client.h" |
+#include "chrome/browser/extensions/chrome_extensions_browser_client.h" |
+#endif |
+ |
#if defined(ENABLE_FULL_PRINTING) |
#include "chrome/browser/printing/background_printing_manager.h" |
#include "chrome/browser/printing/print_preview_dialog_controller.h" |
@@ -71,13 +74,13 @@ TestingBrowserProcess::TestingBrowserProcess() |
local_state_(NULL), |
io_thread_(NULL), |
system_request_context_(NULL), |
- platform_part_(new TestingBrowserProcessPlatformPart()), |
- extensions_browser_client_( |
- new extensions::ChromeExtensionsBrowserClient) { |
+ platform_part_(new TestingBrowserProcessPlatformPart()) { |
#if defined(ENABLE_EXTENSIONS) |
apps::AppsClient::Set(ChromeAppsClient::GetInstance()); |
-#endif |
+ extensions_browser_client_.reset( |
+ new extensions::ChromeExtensionsBrowserClient); |
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); |
+#endif |
} |
TestingBrowserProcess::~TestingBrowserProcess() { |
@@ -85,7 +88,9 @@ TestingBrowserProcess::~TestingBrowserProcess() { |
#if defined(ENABLE_CONFIGURATION_POLICY) |
SetBrowserPolicyConnector(NULL); |
#endif |
+#if defined(ENABLE_EXTENSIONS) |
extensions::ExtensionsBrowserClient::Set(NULL); |
+#endif |
// Destructors for some objects owned by TestingBrowserProcess will use |
// g_browser_process if it is not NULL, so it must be NULL before proceeding. |