Make remaining parts of components/metrics use metrics namespace.

components/metrics/cloned_install_detector.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 "components/metrics/cloned_install_detector.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
-#include "components/metrics/cloned_install_detector.h"
 #include "components/metrics/machine_id_provider.h"
 #include "components/metrics/metrics_hashes.h"
 #include "components/metrics/metrics_pref_names.h"
 
 namespace metrics {
 
 namespace {
 
 uint32 HashRawId(const std::string& value) {
-  uint64 hash = metrics::HashMetricName(value);
+  uint64 hash = HashMetricName(value);
 
   // Only use 24 bits from the 64-bit hash.
   return hash & ((1 << 24) - 1);
 }
 
 // State of the generated machine id in relation to the previously stored value.
 // Note: UMA histogram enum - don't re-order or remove entries
 enum MachineIdState {
   ID_GENERATION_FAILED,
   ID_NO_STORED_VALUE,
@@ skipping 15 matching lines @@
 
 ClonedInstallDetector::~ClonedInstallDetector() {
 }
 
 void ClonedInstallDetector::CheckForClonedInstall(
     PrefService* local_state,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   base::PostTaskAndReplyWithResult(
       task_runner.get(),
       FROM_HERE,
-      base::Bind(&metrics::MachineIdProvider::GetMachineId, raw_id_provider_),
-      base::Bind(&metrics::ClonedInstallDetector::SaveMachineId,
+      base::Bind(&MachineIdProvider::GetMachineId, raw_id_provider_),
+      base::Bind(&ClonedInstallDetector::SaveMachineId,
                  weak_ptr_factory_.GetWeakPtr(),
                  local_state));
 }
 
 void ClonedInstallDetector::SaveMachineId(PrefService* local_state,
                                           std::string raw_id) {
   if (raw_id.empty()) {
     LogMachineIdState(ID_GENERATION_FAILED);
     local_state->ClearPref(prefs::kMetricsMachineId);
     return;
@@ skipping 17 matching lines @@
 
   local_state->SetInteger(prefs::kMetricsMachineId, hashed_id);
 }
 
 // static
 void ClonedInstallDetector::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterIntegerPref(prefs::kMetricsMachineId, 0);
 }
 
 }  // namespace metrics