[NaCl] Build fix for disable_nacl=1

chrome/browser/extensions/plugin_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/plugin_manager.h"
@@ skipping 49 matching lines @@
       if (plugin->is_public) {
         filter->RestrictPluginToProfileAndOrigin(
             plugin->path, profile_, GURL());
       } else {
         filter->RestrictPluginToProfileAndOrigin(
             plugin->path, profile_, extension->url());
       }
     }
   }
 
+#if !defined(DISABLE_NACL)
   const NaClModuleInfo::List* nacl_modules =

[Lei Zhang, 2014/07/17 05:33:47]

RegisterNaClModule(), UnregisterNaClModule(), UpdatePluginListWithNaClModules(),
and FindNaClModule() can also be ifdefed out.

[tzik, 2014/07/17 05:53:31]

Done.

       NaClModuleInfo::GetNaClModules(extension);
   if (nacl_modules) {
     plugins_or_nacl_changed = true;
     for (NaClModuleInfo::List::const_iterator module = nacl_modules->begin();
          module != nacl_modules->end();
          ++module) {
       RegisterNaClModule(*module);
     }
     UpdatePluginListWithNaClModules();
   }
+#endif
 
   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (handler && !handler->handler_url().empty()) {
     plugins_or_nacl_changed = true;
 
     content::WebPluginInfo info;
     info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
     info.name = base::UTF8ToUTF16(handler->extension_id());
     info.path = base::FilePath::FromUTF8Unsafe(handler->extension_id());
 
@@ skipping 24 matching lines @@
     for (PluginInfo::PluginVector::const_iterator plugin = plugins->begin();
          plugin != plugins->end();
          ++plugin) {
       PluginService::GetInstance()->ForcePluginShutdown(plugin->path);
       PluginService::GetInstance()->RefreshPlugins();
       PluginService::GetInstance()->RemoveExtraPluginPath(plugin->path);
       ChromePluginServiceFilter::GetInstance()->UnrestrictPlugin(plugin->path);
     }
   }
 
+#if !defined(DISABLE_NACL)
   const NaClModuleInfo::List* nacl_modules =
       NaClModuleInfo::GetNaClModules(extension);
   if (nacl_modules) {
     plugins_or_nacl_changed = true;
     for (NaClModuleInfo::List::const_iterator module = nacl_modules->begin();
          module != nacl_modules->end();
          ++module) {
       UnregisterNaClModule(*module);
     }
     UpdatePluginListWithNaClModules();
   }
+#endif
 
   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (handler && !handler->handler_url().empty()) {
     plugins_or_nacl_changed = true;
     base::FilePath path =
         base::FilePath::FromUTF8Unsafe(handler->extension_id());
     PluginService::GetInstance()->UnregisterInternalPlugin(path);
     PluginService::GetInstance()->ForcePluginShutdown(path);
     PluginService::GetInstance()->RefreshPlugins();
   }
@@ skipping 64 matching lines @@
 NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {
   for (NaClModuleInfo::List::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }
 
 }  // namespace extensions