Merge MetricsLog and MetricsLogBase.

chrome/browser/metrics/extensions_metrics_provider.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 "chrome/browser/metrics/extensions_metrics_provider.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "components/metrics/metrics_log_base.h"
+#include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/proto/system_profile.pb.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_set.h"
 #include "third_party/smhasher/src/City.h"
 
 namespace {
 
 // The number of possible hash keys that a client may use.  The UMA client_id
 // value is reduced modulo this value to produce the key used by that
@@ skipping 58 matching lines @@
   Profile* profile = GetMetricsProfile();
   if (profile) {
     return extensions::ExtensionRegistry::Get(profile)
         ->GenerateInstalledExtensionsSet();
   }
 #endif  // defined(ENABLE_EXTENSIONS)
   return scoped_ptr<extensions::ExtensionSet>();
 }
 
 uint64 ExtensionsMetricsProvider::GetClientID() {
-  // TODO(blundell): Create a MetricsLogBase::ClientIDAsInt() API and call it
-  // here as well as in MetricsLogBases's population of the client_id field of
+  // TODO(blundell): Create a MetricsLog::ClientIDAsInt() API and call it
+  // here as well as in MetricsLog's population of the client_id field of
   // the uma_proto.
-  return metrics::MetricsLogBase::Hash(metrics_state_manager_->client_id());
+  return MetricsLog::Hash(metrics_state_manager_->client_id());
 }
 
 void ExtensionsMetricsProvider::ProvideSystemProfileMetrics(
     metrics::SystemProfileProto* system_profile) {
   scoped_ptr<extensions::ExtensionSet> extensions(GetInstalledExtensions());
   if (!extensions)
     return;
 
   const int client_key = GetClientID() % kExtensionListClientKeys;
 
   std::set<int> buckets;
   for (extensions::ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end();
        ++it) {
     buckets.insert(HashExtension((*it)->id(), client_key));
   }
 
   for (std::set<int>::const_iterator it = buckets.begin(); it != buckets.end();
        ++it) {
     system_profile->add_occupied_extension_bucket(*it);
   }
 }