| Index: chrome/browser/metrics/chrome_metrics_service_client.h
|
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| index bc3c14aa28feb8e36763dbf896533d753f6dcb92..e98b31333aa9a3d21122837e79bb404ad549e2ab 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.h
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| @@ -21,7 +21,6 @@
|
|
|
| class ChromeOSMetricsProvider;
|
| class GoogleUpdateMetricsProviderWin;
|
| -class MetricsService;
|
| class PluginMetricsProvider;
|
| class PrefRegistrySimple;
|
| class ProfilerMetricsProvider;
|
| @@ -35,6 +34,7 @@ class FilePath;
|
| }
|
|
|
| namespace metrics {
|
| +class MetricsService;
|
| class MetricsStateManager;
|
| }
|
|
|
| @@ -72,7 +72,7 @@ class ChromeMetricsServiceClient
|
| const std::string& mime_type,
|
| const base::Callback<void(int)>& on_upload_complete) OVERRIDE;
|
|
|
| - MetricsService* metrics_service() { return metrics_service_.get(); }
|
| + metrics::MetricsService* metrics_service() { return metrics_service_.get(); }
|
|
|
| void LogPluginLoadingError(const base::FilePath& plugin_path);
|
|
|
| @@ -131,7 +131,7 @@ class ChromeMetricsServiceClient
|
| metrics::MetricsStateManager* metrics_state_manager_;
|
|
|
| // The MetricsService that |this| is a client of.
|
| - scoped_ptr<MetricsService> metrics_service_;
|
| + scoped_ptr<metrics::MetricsService> metrics_service_;
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|
|
|