Make crash reporting client_id accessible through child_process_logging.

chrome/browser/browser_child_process_host.cc

Index: chrome/browser/browser_child_process_host.cc
diff --git a/chrome/browser/browser_child_process_host.cc b/chrome/browser/browser_child_process_host.cc
index 04be5002ecc317216ce864ce844816a4f1cd125e..6de8f4d53e979160cc682291d62b9f6e73977557 100644
--- a/chrome/browser/browser_child_process_host.cc
+++ b/chrome/browser/browser_child_process_host.cc
@@ -14,9 +14,9 @@
 #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"
@@ -79,16 +79,13 @@ 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
 }