Make crash reporting client_id accessible through child_process_logging.

chrome/common/child_process_logging_mac.mm

 // Copyright (c) 2009 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/common/child_process_logging.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 10 matching lines @@
 const char *kGuidParamName = "guid";
 const char *kGPUVendorIdParamName = "vendid";
 const char *kGPUDeviceIdParamName = "devid";
 const char *kGPUDriverVersionParamName = "driver";
 const char *kGPUPixelShaderVersionParamName = "psver";
 const char *kGPUVertexShaderVersionParamName = "vsver";
 
 static SetCrashKeyValueFuncPtr g_set_key_func;
 static ClearCrashKeyValueFuncPtr g_clear_key_func;
 
+// Account for the terminating null character.
+static const size_t kClientIdSize = 32 + 1;
+static char g_client_id[kClientIdSize];
+
 void SetCrashKeyFunctions(SetCrashKeyValueFuncPtr set_key_func,
                           ClearCrashKeyValueFuncPtr clear_key_func) {
   g_set_key_func = set_key_func;
   g_clear_key_func = clear_key_func;
 }
 
 void SetActiveURLImpl(const GURL& url,
                       SetCrashKeyValueFuncPtr set_key_func,
                       ClearCrashKeyValueFuncPtr clear_key_func) {
 
@@ skipping 45 matching lines @@
 
 void SetActiveURL(const GURL& url) {
   if (g_set_key_func && g_clear_key_func)
     SetActiveURLImpl(url, g_set_key_func, g_clear_key_func);
 }
 
 void SetClientId(const std::string& client_id) {
   std::string str(client_id);
   ReplaceSubstringsAfterOffset(&str, 0, "-", "");
 
+  base::strlcpy(g_client_id, str.c_str(), kClientIdSize);
   if (g_set_key_func)
     SetClientIdImpl(str, g_set_key_func);
 
   std::wstring wstr = ASCIIToWide(str);
   GoogleUpdateSettings::SetMetricsId(wstr);
 }
 
+std::string GetClientId() {
+  return std::string(g_client_id);
+}
+
 void SetActiveExtensions(const std::set<std::string>& extension_ids) {
   // TODO(port)
 }
 
 void SetGpuKeyValue(const char* param_name, const std::string& value_str,
                     SetCrashKeyValueFuncPtr set_key_func) {
   NSString *key = [NSString stringWithUTF8String:param_name];
   NSString *value = [NSString stringWithUTF8String:value_str.c_str()];
   set_key_func(key, value);
 }
@@ skipping 16 matching lines @@
                  base::UintToString(gpu_info.vertex_shader_version()),
                  set_key_func);
 }
 
 void SetGpuInfo(const GPUInfo& gpu_info) {
   if (g_set_key_func)
     SetGpuInfoImpl(gpu_info, g_set_key_func);
 }
 
 }  // namespace child_process_logging