Move webplugininfo.h to content/public.

content/child/npapi/plugin_lib.h

 // 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.
 
 #ifndef CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_
 #define CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/native_library.h"
 #include "build/build_config.h"
 #include "content/child/npapi/webplugin.h"
 #include "content/common/content_export.h"
+#include "content/public/common/webplugininfo.h"
 #include "third_party/npapi/bindings/nphostapi.h"
-#include "webkit/plugins/webplugininfo.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 
 class PluginInstance;
 
 // This struct holds entry points into a plugin.  The entry points are
@@ skipping 24 matching lines @@
   NPPluginFuncs* functions();
 
   // Creates a new instance of this plugin.
   PluginInstance* CreateInstance(const std::string& mime_type);
 
   // Called by the instance when the instance is tearing down.
   void CloseInstance();
 
   // Gets information about this plugin and the mime types that it
   // supports.
-  const webkit::WebPluginInfo& plugin_info() { return web_plugin_info_; }
+  const WebPluginInfo& plugin_info() { return web_plugin_info_; }
 
   //
   // NPAPI functions
   //
 
   // NPAPI method to initialize a Plugin.
   // Initialize can be safely called multiple times
   NPError NP_Initialize();
 
   // NPAPI method to shutdown a Plugin.
@@ skipping 15 matching lines @@
   // Indicates whether plugin unload can be deferred.
   void set_defer_unload(bool defer_unload) {
     defer_unload_ = defer_unload;
   }
 
   // protected for testability.
  protected:
   friend class base::RefCounted<PluginLib>;
 
   // Creates a new PluginLib.
-  explicit PluginLib(const webkit::WebPluginInfo& info);
+  explicit PluginLib(const WebPluginInfo& info);
 
   virtual ~PluginLib();
 
   // Attempts to load the plugin from the library.
   // Returns true if it is a legitimate plugin, false otherwise
   bool Load();
 
   // Unloads the plugin library.
   void Unload();
 
   // Shutdown the plugin library.
   void Shutdown();
 
  private:
-  webkit::WebPluginInfo web_plugin_info_;  // Supported mime types, description
+  WebPluginInfo web_plugin_info_;  // Supported mime types, description
   base::NativeLibrary library_;  // The opened library reference.
   NPPluginFuncs plugin_funcs_;  // The struct of plugin side functions.
   bool initialized_;  // Is the plugin initialized?
   NPSavedData *saved_data_;  // Persisted plugin info for NPAPI.
   int instance_count_;  // Count of plugins in use.
   bool skip_unload_;  // True if library_ should not be unloaded.
 
   // Function pointers to entry points into the plugin.
   PluginEntryPoints entry_points_;
 
   // Set to true if unloading of the plugin dll is to be deferred.
   bool defer_unload_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginLib);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_