Always use ENABLE_PLUGINS to indicate plugins support.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index c577edf5507b7d886645f1b9f874816cd75c6c09..82dfba7f31a552ba55908721fa9fa3815bf1ea47 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -97,6 +97,7 @@ content::PepperPluginInfo::PPP_ShutdownModuleFunc g_nacl_shutdown_module;
 // not marked internal, aside from being automatically registered, they're just
 // regular plugins).
 void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
+#if !defined(OS_ANDROID)

[Nico, 2015/08/28 19:25:13]

Should this be some ENABLE_ define too, based on the argument in the cl
description?

[hshi1, 2015/08/28 20:33:55]

In offline discussion bauberb@ suggested to add an ENABLE_PDF macro, so PTAL.

   content::PepperPluginInfo pdf_info;
   pdf_info.is_internal = true;
   pdf_info.is_out_of_process = true;
@@ -114,6 +115,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   pdf_info.internal_entry_points.shutdown_module = g_pdf_shutdown_module;
   pdf_info.permissions = kPDFPluginPermissions;
   plugins->push_back(pdf_info);
+#endif  // !defined(OS_ANDROID)
 
   base::FilePath path;