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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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.h » ('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 84aa188621518dec978dce952554e520d7ab3b30..72409a87fca65add4fcfaba9f60958d13a0bbd89 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -24,6 +24,7 @@
#include "components/prefs/pref_service.h"
#include "components/subresource_filter/core/browser/ruleset_service.h"
#include "content/public/browser/notification_service.h"
+#include "extensions/features/features.h"
#include "net/url_request/url_request_context_getter.h"
#include "printing/features/features.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -33,7 +34,7 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
#include "chrome/browser/media_galleries/media_file_system_registry.h"
#include "chrome/browser/ui/apps/chrome_app_window_client.h"
@@ -74,7 +75,7 @@ TestingBrowserProcess::TestingBrowserProcess()
system_request_context_(nullptr),
rappor_service_(nullptr),
platform_part_(new TestingBrowserProcessPlatformPart()) {
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
extensions_browser_client_.reset(
new extensions::ChromeExtensionsBrowserClient);
extensions::AppWindowClient::Set(ChromeAppWindowClient::GetInstance());
@@ -85,7 +86,7 @@ TestingBrowserProcess::TestingBrowserProcess()
TestingBrowserProcess::~TestingBrowserProcess() {
EXPECT_FALSE(local_state_);
ShutdownBrowserPolicyConnector();
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
extensions::ExtensionsBrowserClient::Set(nullptr);
#endif
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698