Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/browser/google/google_update_settings_posix.cc

 // Copyright (c) 2011 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/installer/util/google_update_settings.h"
 
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 49 matching lines @@
       return base::WriteFile(consent_file, c_str, size) == size;
     }
   } else {
     g_posix_client_id.Get().clear();
     return base::DeleteFile(consent_file, false);
   }
   return true;
 }
 
 // static
-bool GoogleUpdateSettings::LoadMetricsClientId(std::string* metrics_id) {
+// TODO(gab): Implement storing/loading for all ClientInfo fields on POSIX.
+scoped_ptr<metrics::ClientInfo> GoogleUpdateSettings::LoadMetricsClientInfo() {
+  scoped_ptr<metrics::ClientInfo> client_info(new metrics::ClientInfo);
+
   base::AutoLock lock(g_posix_client_id_lock.Get());
-  *metrics_id = g_posix_client_id.Get();
-  return true;
+  if (g_posix_client_id.Get().empty())
+    return scoped_ptr<metrics::ClientInfo>();
+  client_info->client_id = g_posix_client_id.Get();
+
+  return client_info.Pass();
 }
 
 // static
-bool GoogleUpdateSettings::StoreMetricsClientId(const std::string& client_id) {
+// TODO(gab): Implement storing/loading for all ClientInfo fields on POSIX.
+void GoogleUpdateSettings::StoreMetricsClientInfo(
+    const metrics::ClientInfo& client_info) {
   // Make sure that user has consented to send crashes.
   if (!GoogleUpdateSettings::GetCollectStatsConsent())
-    return false;
+    return;
 
   {
     // Since user has consented, write the metrics id to the file.
     base::AutoLock lock(g_posix_client_id_lock.Get());
-    g_posix_client_id.Get() = client_id;
+    g_posix_client_id.Get() = client_info.client_id;
   }
-  return GoogleUpdateSettings::SetCollectStatsConsent(true);
+  GoogleUpdateSettings::SetCollectStatsConsent(true);
 }
 
 // GetLastRunTime and SetLastRunTime are not implemented for posix. Their
 // current return values signal failure which the caller is designed to
 // handle.
 
 // static
 int GoogleUpdateSettings::GetLastRunTime() {
   return -1;
 }
 
 // static
 bool GoogleUpdateSettings::SetLastRunTime() {
   return false;
 }