Move webplugininfo.h to content/public.

content/browser/plugin_loader_posix.h

 // 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.
 
 #ifndef CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_
 #define CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/utility_process_host_client.h"
+#include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_sender.h"
-#include "webkit/plugins/webplugininfo.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace content {
 class UtilityProcessHost;
 
 // This class is responsible for managing the out-of-process plugin loading on
 // POSIX systems. It primarily lives on the IO thread, but has a brief stay on
@@ skipping 46 matching lines @@
 
   virtual ~PluginLoaderPosix();
 
   // Called on the FILE thread to get the list of plugin paths to probe.
   void GetPluginsToLoad();
 
   // Must be called on the IO thread.
   virtual void LoadPluginsInternal();
 
   // Message handlers.
-  void OnPluginLoaded(uint32 index, const webkit::WebPluginInfo& plugin);
+  void OnPluginLoaded(uint32 index, const WebPluginInfo& plugin);
   void OnPluginLoadFailed(uint32 index, const base::FilePath& plugin_path);
 
   // Checks if the plugin path is an internal plugin, and, if it is, adds it to
   // |loaded_plugins_|.
   bool MaybeAddInternalPlugin(const base::FilePath& plugin_path);
 
   // Runs all the registered callbacks on each's target loop if the condition
   // for ending the load process is done (i.e. the |next_load_index_| is outside
   // the range of the |canonical_list_|).
   bool MaybeRunPendingCallbacks();
 
   // The process host for which this is a client.
   base::WeakPtr<UtilityProcessHost> process_host_;
 
   // A list of paths to plugins which will be loaded by the utility process, in
   // the order specified by this vector.
   std::vector<base::FilePath> canonical_list_;
 
   // The index in |canonical_list_| of the plugin that the child process will
   // attempt to load next.
   size_t next_load_index_;
 
   // Internal plugins that have been registered at the time of loading.
-  std::vector<webkit::WebPluginInfo> internal_plugins_;
+  std::vector<WebPluginInfo> internal_plugins_;
 
   // A vector of plugins that have been loaded successfully.
-  std::vector<webkit::WebPluginInfo> loaded_plugins_;
+  std::vector<WebPluginInfo> loaded_plugins_;
 
   // The callback and message loop on which the callback will be run when the
   // plugin loading process has been completed.
   std::deque<PendingCallback> callbacks_;
 
   // The time at which plugin loading started.
   base::TimeTicks load_start_time_;
 
   friend class MockPluginLoaderPosix;
   DISALLOW_COPY_AND_ASSIGN(PluginLoaderPosix);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_