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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/content_settings_observer_unittest.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/renderer/content_settings_observer.cc ('k') | chrome/renderer/pepper/pepper_uma_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer_unittest.cc
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc
index 121dcd5807991599737f7f94a11ac28f4d0dceb5..7614ddfee833f033a39cafb08a1e84588d5b1968 100644
--- a/chrome/renderer/content_settings_observer_unittest.cc
+++ b/chrome/renderer/content_settings_observer_unittest.cc
@@ -6,12 +6,13 @@
#include "chrome/common/url_constants.h"
#include "content/public/common/url_constants.h"
+#include "extensions/features/features.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "url/gurl.h"
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/common/constants.h"
#endif
@@ -34,7 +35,7 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) {
WebSecurityOrigin::create(chrome_dev_tools_url),
GURL()));
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
GURL extension_url =
GURL(std::string(extensions::kExtensionScheme).append(end_url));
EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings(
« no previous file with comments | « chrome/renderer/content_settings_observer.cc ('k') | chrome/renderer/pepper/pepper_uma_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698