Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc |
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc |
index 829f061c67d8a5eec14d2ea3f3899dfc0a538080..2a70d88dd0d8bb5b647b07272507d5cee34ec74e 100644 |
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc |
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc |
@@ -38,6 +38,7 @@ |
#include "components/sync_preferences/pref_service_syncable.h" |
#include "components/sync_preferences/testing_pref_service_syncable.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
+#include "ppapi/features/features.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "url/gurl.h" |
@@ -337,7 +338,7 @@ TEST_F(PrefProviderTest, Patterns) { |
pref_content_settings_provider.ShutdownOnUIThread(); |
} |
-#if defined(ENABLE_PLUGINS) |
+#if BUILDFLAG(ENABLE_PLUGINS) |
TEST_F(PrefProviderTest, ResourceIdentifier) { |
TestingProfile testing_profile; |
PrefProvider pref_content_settings_provider(testing_profile.GetPrefs(), |
@@ -518,7 +519,7 @@ TEST_F(PrefProviderTest, ClearAllContentSettingsRules) { |
provider.SetWebsiteSetting(pattern, wildcard, |
CONTENT_SETTINGS_TYPE_GEOLOCATION, |
ResourceIdentifier(), value->DeepCopy()); |
-#if defined(ENABLE_PLUGINS) |
+#if BUILDFLAG(ENABLE_PLUGINS) |
// Non-empty pattern, plugins, non-empty resource identifier. |
provider.SetWebsiteSetting(pattern, wildcard, CONTENT_SETTINGS_TYPE_PLUGINS, |
res_id, value->DeepCopy()); |
@@ -538,7 +539,7 @@ TEST_F(PrefProviderTest, ClearAllContentSettingsRules) { |
provider.ClearAllContentSettingsRules(CONTENT_SETTINGS_TYPE_JAVASCRIPT); |
provider.ClearAllContentSettingsRules(CONTENT_SETTINGS_TYPE_GEOLOCATION); |
-#if defined(ENABLE_PLUGINS) |
+#if BUILDFLAG(ENABLE_PLUGINS) |
provider.ClearAllContentSettingsRules(CONTENT_SETTINGS_TYPE_PLUGINS); |
#endif |
@@ -547,7 +548,7 @@ TEST_F(PrefProviderTest, ClearAllContentSettingsRules) { |
const char* empty_prefs[] = { |
registry->Get(CONTENT_SETTINGS_TYPE_JAVASCRIPT)->pref_name().c_str(), |
registry->Get(CONTENT_SETTINGS_TYPE_GEOLOCATION)->pref_name().c_str(), |
-#if defined(ENABLE_PLUGINS) |
+#if BUILDFLAG(ENABLE_PLUGINS) |
registry->Get(CONTENT_SETTINGS_TYPE_PLUGINS)->pref_name().c_str(), |
#endif |
}; |