Make crash reporting client_id accessible through child_process_logging.

chrome/browser/browser_child_process_host.cc

 // Copyright (c) 2010 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/browser_child_process_host.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/app/breakpad_mac.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
+#include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/google_update_settings.h"
 
@@ skipping 42 matching lines @@
 
   if (resource_dispatcher_host_)
     resource_dispatcher_host_->CancelRequestsForProcess(id());
 }
 
 // static
 void BrowserChildProcessHost::SetCrashReporterCommandLine(
     CommandLine* command_line) {
 #if defined(USE_LINUX_BREAKPAD)
   if (IsCrashReporterEnabled()) {
-    std::string client_id =
-        g_browser_process->local_state()->GetString(prefs::kMetricsClientID);
     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-                                    client_id + "," + base::GetLinuxDistro());
+        child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
   }
 #elif defined(OS_MACOSX)
   if (IsCrashReporterEnabled()) {
-    std::string client_id =
-        g_browser_process->local_state()->GetString(prefs::kMetricsClientID);
-    command_line->AppendSwitchASCII(switches::kEnableCrashReporter, client_id);
+    command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
+                                    child_process_logging::GetClientId());
   }
 #endif  // OS_MACOSX
 }
 
 // static
 void BrowserChildProcessHost::TerminateAll() {
   // Make a copy since the ChildProcessHost dtor mutates the original list.
   ChildProcessList copy = *(Singleton<ChildProcessList>::get());
   STLDeleteElements(&copy);
 }
@@ skipping 109 matching lines @@
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool BrowserChildProcessHost::Iterator::Done() {
   return iterator_ == Singleton<ChildProcessList>::get()->end();
 }