Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/browser/metrics/extensions_metrics_provider_unittest.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 <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
+#include "components/metrics/client_info.h"
+#include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/proto/system_profile.pb.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/extension_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 bool IsMetricsReportingEnabled() {
   return true;
 }
 
+void StoreNoClientInfoBackup(const metrics::ClientInfo& /* client_info */) {
+}
+
+scoped_ptr<metrics::ClientInfo> ReturnNoBackup() {
+  return scoped_ptr<metrics::ClientInfo>();
+}
+
 class TestExtensionsMetricsProvider : public ExtensionsMetricsProvider {
  public:
   explicit TestExtensionsMetricsProvider(
       metrics::MetricsStateManager* metrics_state_manager)
       : ExtensionsMetricsProvider(metrics_state_manager) {}
 
   // Makes the protected HashExtension method available to testing code.
   using ExtensionsMetricsProvider::HashExtension;
 
  protected:
@@ skipping 53 matching lines @@
   EXPECT_EQ(10,
             TestExtensionsMetricsProvider::HashExtension(
                 "mdhofdjgenpkhlmddfaegdjddcecipmo", 3817));
 }
 
 // Checks that the fake set of extensions provided by
 // TestExtensionsMetricsProvider is encoded properly.
 TEST(ExtensionsMetricsProvider, SystemProtoEncoding) {
   metrics::SystemProfileProto system_profile;
   TestingPrefServiceSimple local_state;
-  metrics::MetricsStateManager::RegisterPrefs(local_state.registry());
+  MetricsService::RegisterPrefs(local_state.registry());
   scoped_ptr<metrics::MetricsStateManager> metrics_state_manager(
-      metrics::MetricsStateManager::Create(&local_state,
-                base::Bind(&IsMetricsReportingEnabled)));
+      metrics::MetricsStateManager::Create(
+          &local_state,
+          base::Bind(&IsMetricsReportingEnabled),
+          base::Bind(&StoreNoClientInfoBackup),
+          base::Bind(&ReturnNoBackup)));
   TestExtensionsMetricsProvider extension_metrics(metrics_state_manager.get());
   extension_metrics.ProvideSystemProfileMetrics(&system_profile);
   ASSERT_EQ(2, system_profile.occupied_extension_bucket_size());
   EXPECT_EQ(10, system_profile.occupied_extension_bucket(0));
   EXPECT_EQ(1007, system_profile.occupied_extension_bucket(1));
 }