Create the crash key registration system and register some Mac-specific keys.

chrome/app/breakpad_mac.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/app/breakpad_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/auto_reset.h"
 #include "base/base_switches.h"
 #import "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #import "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #import "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
 #import "breakpad/src/client/mac/Framework/Breakpad.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/crash_keys.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h"
 #include "policy/policy_constants.h"
 
 namespace {
 
 BreakpadRef gBreakpadRef = NULL;
 
@@ skipping 204 matching lines @@
   [breakpad_config setObject:base::SysUTF8ToNSString(dir_crash_dumps.value())
                       forKey:@BREAKPAD_DUMP_DIRECTORY];
 
   // Initialize Breakpad.
   gBreakpadRef = BreakpadCreate(breakpad_config);
   if (!gBreakpadRef) {
     LOG_IF(ERROR, base::mac::AmIBundled()) << "Breakpad initializaiton failed";
     return;
   }
 
+  // Initialize the new scoped crash key system.
+  base::debug::SetCrashKeyReportingFunctions(&SetCrashKeyValueImpl,
+                                             &ClearCrashKeyValueImpl);
+  crash_keys::RegisterChromeCrashKeys(/*init_func=*/NULL);
+
   // Set Breakpad metadata values.  These values are added to Info.plist during
   // the branded Google Chrome.app build.
   SetCrashKeyValue(@"ver", [info_dictionary objectForKey:@BREAKPAD_VERSION]);
   SetCrashKeyValue(@"prod", [info_dictionary objectForKey:@BREAKPAD_PRODUCT]);
   SetCrashKeyValue(@"plat", @"OS X");
 
-  // Enable child process crashes to include the page URL.
-  // TODO: Should this only be done for certain process types?
-  base::debug::SetCrashKeyReportingFunctions(&SetCrashKeyValueImpl,
-                                             &ClearCrashKeyValueImpl);
-
   if (!is_browser) {
     // Get the guid from the command line switch.
     std::string guid =
         command_line->GetSwitchValueASCII(switches::kEnableCrashReporter);
     child_process_logging::SetClientId(guid);
   }
 
   logging::SetLogMessageHandler(&FatalMessageHandler);
   logging::SetDumpWithoutCrashingFunction(&DumpHelper::DumpWithoutCrashing);
 }
@@ skipping 14 matching lines @@
 
 #if !defined(DISABLE_NACL)
   if (process_type_switch == switches::kNaClLoaderProcess) {
     BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL);
   }
 #endif
 
   // Store process type in crash dump.
   SetCrashKeyValue(@"ptype", process_type);
 }