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

Unified Diff: chrome/common/chrome_content_client_unittest.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
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/chrome_features.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client_unittest.cc
diff --git a/chrome/common/chrome_content_client_unittest.cc b/chrome/common/chrome_content_client_unittest.cc
index 6f831d2e41bf25f8b5cb1af6f1e9957fcc31c61f..057ff2b1604d72823ac65d80395fdb2569c1b4e7 100644
--- a/chrome/common/chrome_content_client_unittest.cc
+++ b/chrome/common/chrome_content_client_unittest.cc
@@ -13,6 +13,7 @@
#include "build/build_config.h"
#include "content/public/common/content_switches.h"
#include "extensions/common/constants.h"
+#include "ppapi/features/features.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -98,7 +99,7 @@ TEST(ChromeContentClientTest, Basic) {
#endif
}
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
TEST(ChromeContentClientTest, FindMostRecent) {
std::vector<std::unique_ptr<content::PepperPluginInfo>> version_vector;
// Test an empty vector.
@@ -164,7 +165,7 @@ TEST(ChromeContentClientTest, FindMostRecent) {
most_recent = ChromeContentClient::FindMostRecentPlugin(version_vector);
EXPECT_STREQ("system_flash", most_recent->name.c_str());
}
-#endif // defined(ENABLE_PLUGINS)
+#endif // BUILDFLAG(ENABLE_PLUGINS)
TEST(ChromeContentClientTest, AdditionalSchemes) {
EXPECT_TRUE(url::IsStandard(
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/chrome_features.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698