Make WebPluginInfo more generic

chrome/renderer/chrome_content_renderer_client.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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 264 matching lines @@
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePluginImpl(
       RenderView* render_view,
       WebFrame* frame,
       const WebPluginParams& original_params,
       bool* is_default_plugin) {
   bool found = false;
   *is_default_plugin = false;
   CommandLine* cmd = CommandLine::ForCurrentProcess();
-  webkit::npapi::WebPluginInfo info;
+  webkit::WebPluginInfo info;
   GURL url(original_params.url);
   std::string orig_mime_type = original_params.mimeType.utf8();
   std::string actual_mime_type;
   render_view->Send(new ViewHostMsg_GetPluginInfo(
       render_view->routing_id(), url, frame->top()->document().url(),
       orig_mime_type, &found, &info, &actual_mime_type));
 
   if (!found)
     return NULL;
-  if (!webkit::npapi::IsPluginEnabled(info))
+  if (!webkit::IsPluginEnabled(info))
     return NULL;
 
   *is_default_plugin =
     info.path.value() == webkit::npapi::kDefaultPluginLibraryName;
 
   if (orig_mime_type == actual_mime_type) {
     UMA_HISTOGRAM_ENUMERATION(kPluginTypeMismatch,
                               PLUGIN_TYPE_MISMATCH_NONE,
                               PLUGIN_TYPE_MISMATCH_NUM_EVENTS);
   } else if (orig_mime_type.empty()) {
@@ skipping 97 matching lines @@
       if (!allow_nacl) {
         GURL nexe_url;
         if (actual_mime_type == kNaClPluginMimeType) {
           nexe_url = url;  // Normal embedded NaCl plugin.
         } else {
           // Content type handling NaCl plugin; the "nacl" param on the
           // MIME type holds the nexe URL.
           string16 nacl_attr = ASCIIToUTF16(kNaClPluginManifestAttribute);
           for (size_t i = 0; i < info.mime_types.size(); ++i) {
             if (info.mime_types[i].mime_type == actual_mime_type) {
-              const webkit::npapi::WebPluginMimeType& content_type =
+              const webkit::WebPluginMimeType& content_type =
                   info.mime_types[i];
               for (size_t i = 0;
                   i < content_type.additional_param_names.size(); ++i) {
                 if (content_type.additional_param_names[i] == nacl_attr) {
                   nexe_url = GURL(content_type.additional_param_values[i]);
                   break;
                 }
               }
               break;
             }
@@ skipping 279 matching lines @@
   if (spellcheck_.get())
     thread->RemoveObserver(spellcheck_.get());
   SpellCheck* new_spellcheck = new SpellCheck();
   if (spellcheck_provider_)
     spellcheck_provider_->SetSpellCheck(new_spellcheck);
   spellcheck_.reset(new_spellcheck);
   thread->AddObserver(new_spellcheck);
 }
 
 }  // namespace chrome