Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 434613003: Remove all the browser side extensions code from Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4ab486da4a38d216ddcae3b897712b00c1a31844..f704280101eb9c21e99f8252f1f1509d1354bc60 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -11,7 +11,6 @@
#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/browser/ui/apps/chrome_apps_client.h"
@@ -28,18 +27,19 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
-#include "chrome/browser/media_galleries/media_file_system_registry.h"
-#include "components/storage_monitor/storage_monitor.h"
-#include "components/storage_monitor/test_storage_monitor.h"
-#endif
-
#if defined(ENABLE_CONFIGURATION_POLICY)
#include "components/policy/core/browser/browser_policy_connector.h"
#else
#include "components/policy/core/common/policy_service_stub.h"
#endif // defined(ENABLE_CONFIGURATION_POLICY)
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
+#include "chrome/browser/media_galleries/media_file_system_registry.h"
+#include "components/storage_monitor/storage_monitor.h"
+#include "components/storage_monitor/test_storage_monitor.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 +71,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)
+ extensions_browser_client_.reset(
+ new extensions::ChromeExtensionsBrowserClient);
apps::AppsClient::Set(ChromeAppsClient::GetInstance());
-#endif
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
+#endif
}
TestingBrowserProcess::~TestingBrowserProcess() {
@@ -85,7 +85,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.
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698