Chromecast fix: MetricsStateManager segfaults if callbacks are empty.

chromecast/metrics/cast_metrics_service_client.cc

 // Copyright 2014 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.
 
 #include "chromecast/metrics/cast_metrics_service_client.h"
 
 #include "base/i18n/rtl.h"
 #include "chromecast/common/chromecast_config.h"
 #include "chromecast/metrics/platform_metrics_providers.h"
+#include "components/metrics/client_info.h"
 #include "components/metrics/metrics_provider.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/net/net_metrics_log_uploader.h"
 
 namespace chromecast {
 namespace metrics {
 
+namespace {
+
+void StoreClientInfo(const ::metrics::ClientInfo& client_info) {
+}
+
+scoped_ptr<::metrics::ClientInfo> LoadClientInfo() {
+  return scoped_ptr<::metrics::ClientInfo>();
+}
+
+}  // namespace
+
 // static
 CastMetricsServiceClient* CastMetricsServiceClient::Create(
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context) {
   return new CastMetricsServiceClient(pref_service, request_context);
 }
 
 void CastMetricsServiceClient::SetMetricsClientId(
     const std::string& client_id) {
   LOG(INFO) << "Metrics client ID set: " << client_id;
@@ skipping 57 matching lines @@
   }
 }
 
 CastMetricsServiceClient::CastMetricsServiceClient(
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context)
     : metrics_state_manager_(::metrics::MetricsStateManager::Create(
           pref_service,
           base::Bind(&CastMetricsServiceClient::IsReportingEnabled,
                      base::Unretained(this)),
-                     ::metrics::MetricsStateManager::StoreClientInfoCallback(),
-                     ::metrics::MetricsStateManager::LoadClientInfoCallback())),
+                     base::Bind(&StoreClientInfo),
+                     base::Bind(&LoadClientInfo))),
       metrics_service_(new ::metrics::MetricsService(
           metrics_state_manager_.get(),
           this,
-          ChromecastConfig::GetInstance()->pref_service())),
+          pref_service)),
       request_context_(request_context) {
   // Always create a client id as it may also be used by crash reporting,
   // (indirectly) included in feedback, and can be queried during setup.
   // For UMA and crash reporting, associated opt-in settings will control
   // sending reports as directed by the user.
   // For Setup (which also communicates the user's opt-in preferences),
   // report the client-id and expect that setup will handle the current opt-in
   // value.
   metrics_state_manager_->ForceClientIdCreation();
 
   // TODO(gunsch): Add the following: GPUMetricsProvider,
   // NetworkMetricsProvider, ProfilerMetricsProvider. See: crbug/404791
   RegisterPlatformMetricsProviders(metrics_service_.get());
 
   metrics_service_->InitializeMetricsRecordingState();
 
   if (IsReportingEnabled())
     metrics_service_->Start();
 }
 
 CastMetricsServiceClient::~CastMetricsServiceClient() {
 }
 
 bool CastMetricsServiceClient::IsReportingEnabled() {
   return PlatformIsReportingEnabled();
 }
 
 }  // namespace metrics
 }  // namespace chromecast