Delete code corresponding to old UMA prefs.

chromecast/browser/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/browser/metrics/cast_metrics_service_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "chromecast/base/chromecast_switches.h"
 #include "chromecast/browser/metrics/cast_stability_metrics_provider.h"
 #include "chromecast/browser/metrics/platform_metrics_providers.h"
 #include "chromecast/common/pref_names.h"
 #include "components/metrics/client_info.h"
 #include "components/metrics/gpu/gpu_metrics_provider.h"
-#include "components/metrics/metrics_pref_names.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"
 #include "components/metrics/net/network_metrics_provider.h"
 #include "components/metrics/profiler/profiler_metrics_provider.h"
 #include "components/metrics/url_constants.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_LINUX)
 #include "chromecast/browser/metrics/external_metrics.h"
 #endif  // defined(OS_LINUX)
 
 namespace chromecast {
 namespace metrics {
 
 namespace {
+
 const int kStandardUploadIntervalMinutes = 5;
+
+const char kMetricsOldClientID[] = "user_experience_metrics.client_id";
+
 }  // namespace
 
 // static
 scoped_ptr<CastMetricsServiceClient> CastMetricsServiceClient::Create(
     base::TaskRunner* io_task_runner,
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context) {
   return make_scoped_ptr(new CastMetricsServiceClient(io_task_runner,
                                                       pref_service,
                                                       request_context));
@@ skipping 18 matching lines @@
 }
 
 scoped_ptr< ::metrics::ClientInfo> CastMetricsServiceClient::LoadClientInfo() {
   scoped_ptr< ::metrics::ClientInfo> client_info(new ::metrics::ClientInfo);
 
   // kMetricsIsNewClientID would be missing if either the device was just
   // FDR'ed, or it is on pre-v1.2 build.
   if (!pref_service_->GetBoolean(prefs::kMetricsIsNewClientID)) {
     // If the old client id exists, the device must be on pre-v1.2 build,
     // instead of just being FDR'ed.
-    if (!pref_service_->GetString(::metrics::prefs::kMetricsOldClientID)
-        .empty()) {
+    if (!pref_service_->GetString(kMetricsOldClientID).empty()) {
       // Force old client id to be regenerated. See b/9487011.
       client_info->client_id = base::GenerateGUID();
       pref_service_->SetBoolean(prefs::kMetricsIsNewClientID, true);
       return client_info.Pass();
     }
     // else the device was just FDR'ed, pass through.
   }
 
   const std::string client_id(GetPlatformClientID(cast_service_));
   if (!client_id.empty() && base::IsValidGUID(client_id)) {
@@ skipping 186 matching lines @@
 #endif  // defined(OS_LINUX)
   metrics_service_->Stop();
 }
 
 bool CastMetricsServiceClient::IsReportingEnabled() {
   return PlatformIsReportingEnabled(cast_service_);
 }
 
 }  // namespace metrics
 }  // namespace chromecast