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

Unified Diff: content/shell/browser/layout_test/layout_test_browser_main_parts.cc

Issue 2512563003: Convert enable_plugins to a buildflag header. (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
Index: content/shell/browser/layout_test/layout_test_browser_main_parts.cc
diff --git a/content/shell/browser/layout_test/layout_test_browser_main_parts.cc b/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
index 10642eeed88e2bebb46132fe93b3702531abab00..acb5e2a44feb53a8edf17c75515247bcb2b9efa6 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
+++ b/content/shell/browser/layout_test/layout_test_browser_main_parts.cc
@@ -26,11 +26,12 @@
#include "net/base/filename_util.h"
#include "net/base/net_module.h"
#include "net/grit/net_resources.h"
+#include "ppapi/features/features.h"
#include "storage/browser/quota/quota_manager.h"
#include "ui/base/resource/resource_bundle.h"
#include "url/gurl.h"
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/browser/plugin_service.h"
#include "content/shell/browser/shell_plugin_service_filter.h"
#endif
@@ -83,7 +84,7 @@ void LayoutTestBrowserMainParts::InitializeMessageLoopContext() {
storage::QuotaManager::kPerHostTemporaryPortion,
storage::QuotaCallback()));
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
PluginService* plugin_service = PluginService::GetInstance();
plugin_service_filter_.reset(new ShellPluginServiceFilter);
plugin_service->SetFilter(plugin_service_filter_.get());

Powered by Google App Engine
This is Rietveld 408576698