Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/browser/metrics/metrics_services_manager.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/metrics_services_manager.h"
 
+#include <string>
+
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/rappor/rappor_service.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #endif
 
 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
     : local_state_(local_state) {
@@ skipping 40 matching lines @@
   }
   return metrics_service_client_.get();
 }
 
 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_state_manager_) {
     metrics_state_manager_ = metrics::MetricsStateManager::Create(
         local_state_,
         base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        base::Bind(&GoogleUpdateSettings::StoreMetricsClientInfo),
+        base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo));

[Alexei Svitkine (slow), 2014/07/15 12:53:25]

Just to confirm, are these two OK to run on UI thread?

[gab, 2014/07/15 20:50:05]

On Windows yes (registry access is not considered IO).

On Posix (google_update_settings_posix.cc), a file is used, but this was already
the case before this CL and it uses base::WriteFile which has ThreadRestrictions
checks (so I've been guessing it was okay...).

[Alexei Svitkine (slow), 2014/07/16 14:43:58]

Hmm, I think the POSIX code is problematic. I'm sure it will result in
AssertIOAllowed() triggering in a debug build. But it looks like only
StoreMetricsClientInfo() does IO, but LoadMetricsClientInfo doesn't.

In which case, I think we can fix this by making the POSIX impl of
StoreMetricsClientInfo() post a task to the blocking pool where IO is allowed.

[gab, 2014/07/16 15:51:43]

Right, but GoogleUpdateSettings::StoreMetricsClientInfo() was already called
from ChromeMetricsServiceClient::SetMetricsClientId() before this CL.

I'm happy to fix this in my follow-up for POSIX (see this CL's description), but
for now I don't think this CL makes this worse on POSIX and I'd rather avoid
touching the POSIX impl in this CL.

[Alexei Svitkine (slow), 2014/07/16 19:18:22]

SGTM, but please fix in a follow-up CL.

   }
   return metrics_state_manager_.get();
 }
 
 // TODO(asvitkine): This function does not report the correct value on Android,
 // see http://crbug.com/362192.
 bool MetricsServicesManager::IsMetricsReportingEnabled() const {
   // If the user permits metrics reporting with the checkbox in the
   // prefs, we turn on recording.  We disable metrics completely for
   // non-official builds, or when field trials are forced.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceFieldTrials))
     return false;
 
   bool enabled = false;
 #if defined(GOOGLE_CHROME_BUILD)
 #if defined(OS_CHROMEOS)
   chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
                                             &enabled);
 #else
   enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
 #endif  // #if defined(OS_CHROMEOS)
 #endif  // defined(GOOGLE_CHROME_BUILD)
   return enabled;
 }