Move webplugininfo.h to content/public.

chrome/browser/metrics/metrics_service.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.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 
@@ skipping 28 matching lines @@
 class TemplateURLService;
 
 namespace base {
 class DictionaryValue;
 class MessageLoopProxy;
 }
 
 namespace content {
 class RenderProcessHost;
 class WebContents;
+struct WebPluginInfo;
 }
 
 namespace extensions {
 class ExtensionDownloader;
 class ManifestFetchData;
 }
 
 namespace net {
 class URLFetcher;
 }
 
 namespace prerender {
 bool IsOmniboxEnabled(Profile* profile);
 }
 
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
 
-namespace webkit {
-struct WebPluginInfo;
-}
-
 class MetricsService
     : public chrome_browser_metrics::TrackingSynchronizerObserver,
       public content::BrowserChildProcessObserver,
       public content::NotificationObserver,
       public net::URLFetcherDelegate,
       public MetricsServiceBase {
  public:
   MetricsService();
   virtual ~MetricsService();
 
@@ skipping 147 matching lines @@
   static void InitTaskGetHardwareClass(base::WeakPtr<MetricsService> self,
                                        base::MessageLoopProxy* target_loop);
 
   // Callback from InitTaskGetHardwareClass() that continues the init task by
   // loading plugin information.
   void OnInitTaskGotHardwareClass(const std::string& hardware_class);
 
   // Callback from PluginService::GetPlugins() that continues the init task by
   // launching a task to gather Google Update statistics.
   void OnInitTaskGotPluginInfo(
-      const std::vector<webkit::WebPluginInfo>& plugins);
+      const std::vector<content::WebPluginInfo>& plugins);
 
   // Task launched by OnInitTaskGotPluginInfo() that continues the init task by
   // loading Google Update statistics.  Called on a blocking pool thread.
   static void InitTaskGetGoogleUpdateData(base::WeakPtr<MetricsService> self,
                                           base::MessageLoopProxy* target_loop);
 
   // Callback from InitTaskGetGoogleUpdateData() that continues the init task by
   // loading profiler data.
   void OnInitTaskGotGoogleUpdateData(
       const GoogleUpdateMetrics& google_update_metrics);
@@ skipping 161 matching lines @@
   // state.
   State state_;
 
   // Chrome OS hardware class (e.g., hardware qualification ID). This
   // class identifies the configured system components such as CPU,
   // WiFi adapter, etc.  For non Chrome OS hosts, this will be an
   // empty string.
   std::string hardware_class_;
 
   // The list of plugins which was retrieved on the file thread.
-  std::vector<webkit::WebPluginInfo> plugins_;
+  std::vector<content::WebPluginInfo> plugins_;
 
   // Google Update statistics, which were retrieved on a blocking pool thread.
   GoogleUpdateMetrics google_update_metrics_;
 
   // The initial log, used to record startup metrics.
   scoped_ptr<MetricsLog> initial_log_;
 
   // The outstanding transmission appears as a URL Fetch operation.
   scoped_ptr<net::URLFetcher> current_fetch_;
 
@@ skipping 75 matching lines @@
   friend class extensions::ExtensionDownloader;
   friend class extensions::ManifestFetchData;
 
   // Returns true if prefs::kMetricsReportingEnabled is set.
   static bool IsMetricsReportingEnabled();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MetricsServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_