Move webplugininfo.h to content/public.

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/chrome_notification_types.h"
 #include "chrome/browser/extensions/plugin_manager.h"
@@ skipping 130 matching lines @@
   // MIME type to plugins which handle NaCl modules in order to allow the
   // individual modules to handle these types.
   base::FilePath path;
   if (!PathService::Get(chrome::FILE_NACL_PLUGIN, &path))
     return;
   const content::PepperPluginInfo* pepper_info =
       PluginService::GetInstance()->GetRegisteredPpapiPluginInfo(path);
   if (!pepper_info)
     return;
 
-  std::vector<webkit::WebPluginMimeType>::const_iterator mime_iter;
+  std::vector<content::WebPluginMimeType>::const_iterator mime_iter;
   // Check each MIME type the plugins handle for the NaCl MIME type.
   for (mime_iter = pepper_info->mime_types.begin();
        mime_iter != pepper_info->mime_types.end(); ++mime_iter) {
     if (mime_iter->mime_type == kNaClPluginMimeType) {
       // This plugin handles "application/x-nacl".
 
       PluginService::GetInstance()->UnregisterInternalPlugin(pepper_info->path);
 
-      webkit::WebPluginInfo info = pepper_info->ToWebPluginInfo();
+      content::WebPluginInfo info = pepper_info->ToWebPluginInfo();
 
       for (NaClModuleInfo::List::const_iterator iter =
                nacl_module_list_.begin();
            iter != nacl_module_list_.end(); ++iter) {
         // Add the MIME type specified in the extension to this NaCl plugin,
         // With an extra "nacl" argument to specify the location of the NaCl
         // manifest file.
-        webkit::WebPluginMimeType mime_type_info;
+        content::WebPluginMimeType mime_type_info;
         mime_type_info.mime_type = iter->mime_type;
         mime_type_info.additional_param_names.push_back(UTF8ToUTF16("nacl"));
         mime_type_info.additional_param_values.push_back(
             UTF8ToUTF16(iter->url.spec()));
         info.mime_types.push_back(mime_type_info);
       }
 
       PluginService::GetInstance()->RefreshPlugins();
       PluginService::GetInstance()->RegisterInternalPlugin(info, true);
       // This plugin has been modified, no need to check the rest of its
       // types, but continue checking other plugins.
       break;
     }
   }
 }
 
 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