Commit bf984bb6 authored by gunsch's avatar gunsch Committed by Commit bot

Chromecast buildfix: MetricsService has moved to metrics namespace.

R=isherman@chromium.org,lcwu@chromium.org
BUG=374763

Review URL: https://codereview.chromium.org/510483004

Cr-Commit-Position: refs/heads/master@{#292068}
parent 884a1607
...@@ -10,7 +10,7 @@ namespace chromecast { ...@@ -10,7 +10,7 @@ namespace chromecast {
namespace metrics { namespace metrics {
void RegisterPrefs(PrefRegistrySimple* registry) { void RegisterPrefs(PrefRegistrySimple* registry) {
MetricsService::RegisterPrefs(registry); ::metrics::MetricsService::RegisterPrefs(registry);
} }
} // namespace metrics } // namespace metrics
......
...@@ -94,7 +94,7 @@ CastMetricsServiceClient::CastMetricsServiceClient( ...@@ -94,7 +94,7 @@ CastMetricsServiceClient::CastMetricsServiceClient(
base::Unretained(this)), base::Unretained(this)),
::metrics::MetricsStateManager::StoreClientInfoCallback(), ::metrics::MetricsStateManager::StoreClientInfoCallback(),
::metrics::MetricsStateManager::LoadClientInfoCallback())), ::metrics::MetricsStateManager::LoadClientInfoCallback())),
metrics_service_(new MetricsService( metrics_service_(new ::metrics::MetricsService(
metrics_state_manager_.get(), metrics_state_manager_.get(),
this, this,
ChromecastConfig::GetInstance()->pref_service())), ChromecastConfig::GetInstance()->pref_service())),
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "components/metrics/metrics_service_client.h" #include "components/metrics/metrics_service_client.h"
class MetricsService;
class PrefService; class PrefService;
namespace metrics { namespace metrics {
class MetricsService;
class MetricsStateManager; class MetricsStateManager;
} // namespace metrics } // namespace metrics
...@@ -62,7 +62,7 @@ class CastMetricsServiceClient : public ::metrics::MetricsServiceClient { ...@@ -62,7 +62,7 @@ class CastMetricsServiceClient : public ::metrics::MetricsServiceClient {
bool IsReportingEnabled(); bool IsReportingEnabled();
scoped_ptr< ::metrics::MetricsStateManager> metrics_state_manager_; scoped_ptr< ::metrics::MetricsStateManager> metrics_state_manager_;
scoped_ptr<MetricsService> metrics_service_; scoped_ptr< ::metrics::MetricsService> metrics_service_;
net::URLRequestContextGetter* request_context_; net::URLRequestContextGetter* request_context_;
DISALLOW_COPY_AND_ASSIGN(CastMetricsServiceClient); DISALLOW_COPY_AND_ASSIGN(CastMetricsServiceClient);
......
...@@ -7,13 +7,16 @@ ...@@ -7,13 +7,16 @@
#include "components/metrics/proto/system_profile.pb.h" #include "components/metrics/proto/system_profile.pb.h"
namespace metrics {
class MetricsService; class MetricsService;
}
namespace chromecast { namespace chromecast {
namespace metrics { namespace metrics {
// Build-level hook for different platforms to provide data to MetricsService. // Build-level hook for different platforms to provide data to MetricsService.
void RegisterPlatformMetricsProviders(MetricsService* metrics_service); void RegisterPlatformMetricsProviders(
::metrics::MetricsService* metrics_service);
// Returns the current release channel. // Returns the current release channel.
::metrics::SystemProfileProto::Channel GetPlatformReleaseChannel(); ::metrics::SystemProfileProto::Channel GetPlatformReleaseChannel();
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
namespace chromecast { namespace chromecast {
namespace metrics { namespace metrics {
void RegisterPlatformMetricsProviders(MetricsService* metrics_service) { void RegisterPlatformMetricsProviders(
::metrics::MetricsService* metrics_service) {
} }
::metrics::SystemProfileProto::Channel GetPlatformReleaseChannel() { ::metrics::SystemProfileProto::Channel GetPlatformReleaseChannel() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment