Move webplugininfo.h to content/public.

content/child/npapi/plugin_lib.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/child/npapi/plugin_lib.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 15 matching lines @@
   // instance function calls (i.e. NP_Initialize and NP_Shutdown).  So we keep
   // a map of PluginLib objects.
   if (!g_loaded_libs)
     g_loaded_libs = new std::vector<scoped_refptr<PluginLib> >;
 
   for (size_t i = 0; i < g_loaded_libs->size(); ++i) {
     if ((*g_loaded_libs)[i]->plugin_info().path == filename)
       return (*g_loaded_libs)[i].get();
   }
 
-  webkit::WebPluginInfo info;
+  WebPluginInfo info;
   if (!PluginList::Singleton()->ReadPluginInfo(filename, &info))
     return NULL;
 
   return new PluginLib(info);
 }
 
 void PluginLib::UnloadAllPlugins() {
   if (g_loaded_libs) {
     // PluginLib::Unload() can remove items from the list and even delete
     // the list when it removes the last item, so we must work with a copy
     // of the list so that we don't get the carpet removed under our feet.
     std::vector<scoped_refptr<PluginLib> > loaded_libs(*g_loaded_libs);
     for (size_t i = 0; i < loaded_libs.size(); ++i)
       loaded_libs[i]->Unload();
 
     if (g_loaded_libs && g_loaded_libs->empty()) {
       delete g_loaded_libs;
       g_loaded_libs = NULL;
     }
   }
 }
 
 void PluginLib::ShutdownAllPlugins() {
   if (g_loaded_libs) {
     for (size_t i = 0; i < g_loaded_libs->size(); ++i)
       (*g_loaded_libs)[i]->Shutdown();
   }
 }
 
-PluginLib::PluginLib(const webkit::WebPluginInfo& info)
+PluginLib::PluginLib(const WebPluginInfo& info)
     : web_plugin_info_(info),
       library_(NULL),
       initialized_(false),
       saved_data_(0),
       instance_count_(0),
       skip_unload_(false),
       defer_unload_(false) {
   base::StatsCounter(kPluginLibrariesLoadedCounter).Increment();
   memset(static_cast<void*>(&plugin_funcs_), 0, sizeof(plugin_funcs_));
   g_loaded_libs->push_back(make_scoped_refptr(this));
@@ skipping 249 matching lines @@
 }
 
 void PluginLib::Shutdown() {
   if (initialized_) {
     NP_Shutdown();
     initialized_ = false;
   }
 }
 
 }  // namespace content