NOT FOR REVIEW: Aura on Android

chrome/browser/extensions/plugin_manager.cc

Index: chrome/browser/extensions/plugin_manager.cc
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index e86fcb807d07239668a4a4361bb1edfd7f4dc92f..293d527b896e20b557d723f677a3b78b1b517503 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -12,8 +12,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
-#include "content/public/browser/plugin_service.h"
-#include "content/public/common/pepper_plugin_info.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/mime_types_handler.h"
@@ -23,6 +21,15 @@
 #include "components/nacl/common/nacl_constants.h"
 #endif
 
+#if defined(ENABLE_PLUGINS)
+#include "content/public/browser/plugin_service.h"
+#endif
+
+// Disabled due to error: "Plugins should be enabled"
+#if !defined(OS_ANDROID)
+#include "content/public/common/pepper_plugin_info.h"
+#endif
+
 using content::PluginService;
 
 namespace extensions {
@@ -172,6 +179,8 @@ void PluginManager::UnregisterNaClModule(const NaClModuleInfo& info) {
 }
 
 void PluginManager::UpdatePluginListWithNaClModules() {
+// Disabled due to error: "Plugins should be enabled"
+#if !defined(OS_ANDROID)
   // An extension has been added which has a nacl_module component, which means
   // there is a MIME type that module wants to handle, so we need to add that
   // MIME type to plugins which handle NaCl modules in order to allow the
@@ -217,6 +226,7 @@ void PluginManager::UpdatePluginListWithNaClModules() {
       break;
     }
   }
+#endif
 }
 
 NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {