Move webplugininfo.h to content/public.

content/common/pepper_plugin_registry.cc

 // Copyright (c) 2012 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 "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/native_library.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
-using webkit::WebPluginInfo;
-
 namespace content {
 namespace {
 
 // Appends any plugins from the command line to the given vector.
 void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) {
   bool out_of_process = true;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiInProcess))
     out_of_process = false;
 
   const std::string value =
@@ skipping 31 matching lines @@
 #else
     plugin.path = base::FilePath(name_parts[0]);
 #endif
     if (name_parts.size() > 1)
       plugin.name = name_parts[1];
     if (name_parts.size() > 2)
       plugin.description = name_parts[2];
     if (name_parts.size() > 3)
       plugin.version = name_parts[3];
     for (size_t j = 1; j < parts.size(); ++j) {
-      webkit::WebPluginMimeType mime_type(parts[j],
-                                          std::string(),
-                                          plugin.description);
+      WebPluginMimeType mime_type(parts[j],
+                                  std::string(),
+                                  plugin.description);
       plugin.mime_types.push_back(mime_type);
     }
 
     // If the plugin name is empty, use the filename.
     if (plugin.name.empty())
       plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName());
 
     // Command-line plugins get full permissions.
     plugin.permissions = ppapi::PERMISSION_ALL_BITS;
 
     plugins->push_back(plugin);
   }
 }
 
 }  // namespace
 
-bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
+bool MakePepperPluginInfo(const WebPluginInfo& webplugin_info,
                           PepperPluginInfo* pepper_info) {
   if (!webplugin_info.is_pepper_plugin())
     return false;
 
   pepper_info->is_out_of_process =
       webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS ||
       webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
   pepper_info->is_sandboxed = webplugin_info.type !=
-      webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
+      WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED;
 
   pepper_info->path = base::FilePath(webplugin_info.path);
   pepper_info->name = UTF16ToASCII(webplugin_info.name);
   pepper_info->description = UTF16ToASCII(webplugin_info.desc);
   pepper_info->version = UTF16ToASCII(webplugin_info.version);
   pepper_info->mime_types = webplugin_info.mime_types;
   pepper_info->permissions = webplugin_info.pepper_permissions;
 
   return true;
 }
@@ skipping 25 matching lines @@
                                                             &error);
       DLOG_IF(WARNING, !library) << "Unable to load plugin "
                                  << plugins[i].path.value() << " "
                                  << error;
       (void)library;  // Prevent release-mode warning.
     }
   }
 }
 
 const PepperPluginInfo* PepperPluginRegistry::GetInfoForPlugin(
-    const webkit::WebPluginInfo& info) {
+    const WebPluginInfo& info) {
   for (size_t i = 0; i < plugin_list_.size(); ++i) {
     if (info.path == plugin_list_[i].path)
       return &plugin_list_[i];
   }
   // We did not find the plugin in our list. But wait! the plugin can also
   // be a latecomer, as it happens with pepper flash. This information
   // is actually in |info| and we can use it to construct it and add it to
   // the list. This same deal needs to be done in the browser side in
   // PluginService.
   PepperPluginInfo plugin;
@@ skipping 70 matching lines @@
       if (!module->InitAsLibrary(current.path)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     }
     preloaded_modules_[current.path] = module;
   }
 }
 
 }  // namespace content