Make WebPluginInfo more generic

content/common/pepper_plugin_registry.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/native_library.h"
 #include "base/string_split.h"
@@ skipping 15 matching lines @@
           switches::kRegisterPepperPlugins);
   if (value.empty())
     return;
 
   // FORMAT:
   // command-line = <plugin-entry> + *( LWS + "," + LWS + <plugin-entry> )
   // plugin-entry =
   //    <file-path> +
   //    ["#" + <name> + ["#" + <description> + ["#" + <version>]]] +
   //    *1( LWS + ";" + LWS + <mime-type> )
-
   std::vector<std::string> modules;
   base::SplitString(value, ',', &modules);
   for (size_t i = 0; i < modules.size(); ++i) {
     std::vector<std::string> parts;
     base::SplitString(modules[i], ';', &parts);
     if (parts.size() < 2) {
       DLOG(ERROR) << "Required mime-type not found";
       continue;
     }
 
@@ skipping 10 matching lines @@
 #else
     plugin.path = 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::npapi::WebPluginMimeType mime_type(parts[j],
-                                                 std::string(),
-                                                 plugin.description);
+      webkit::WebPluginMimeType mime_type(parts[j],
+                                          std::string(),
+                                          plugin.description);
       plugin.mime_types.push_back(mime_type);
     }
 
     plugins->push_back(plugin);
   }
 }
 
 }  // namespace
 
-webkit::npapi::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
-  webkit::npapi::WebPluginInfo info;
+webkit::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
+  webkit::WebPluginInfo info;
 
   info.name = name.empty() ? path.BaseName().LossyDisplayName() :
       ASCIIToUTF16(name);
   info.path = path;
   info.version = ASCIIToUTF16(version);
   info.desc = ASCIIToUTF16(description);
   info.mime_types = mime_types;
 
-  webkit::npapi::WebPluginInfo::EnabledStates enabled_state =
-      webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
+  webkit::WebPluginInfo::EnabledStates enabled_state =
+      webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
 
   if (!enabled) {
     enabled_state =
-        webkit::npapi::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
+        webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
   }
 
   info.enabled = enabled_state;
   return info;
 }
 
 PepperPluginInfo::PepperPluginInfo()
     : is_internal(false),
       is_out_of_process(false),
       enabled(true) {
@@ skipping 117 matching lines @@
 base::MessageLoopProxy* PepperPluginRegistry::GetIPCMessageLoop() {
   // This is called only in the renderer so we know we have a child process.
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->io_message_loop_proxy();
 }
 
 base::WaitableEvent* PepperPluginRegistry::GetShutdownEvent() {
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->GetShutDownEvent();
 }