Index: chrome/browser/metrics/metrics_service.h |
=================================================================== |
--- chrome/browser/metrics/metrics_service.h (revision 212806) |
+++ chrome/browser/metrics/metrics_service.h (working copy) |
@@ -46,6 +46,7 @@ |
namespace content { |
class RenderProcessHost; |
class WebContents; |
+struct WebPluginInfo; |
} |
namespace extensions { |
@@ -65,10 +66,6 @@ |
struct ProcessDataSnapshot; |
} |
-namespace webkit { |
-struct WebPluginInfo; |
-} |
- |
class MetricsService |
: public chrome_browser_metrics::TrackingSynchronizerObserver, |
public content::BrowserChildProcessObserver, |
@@ -236,7 +233,7 @@ |
// 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. |
@@ -418,7 +415,7 @@ |
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_; |