Add crash keys for the installer covering simple InstallerState fields.

chrome/installer/setup/installer_crash_reporter_client.cc

 // Copyright 2015 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/setup/installer_crash_reporter_client.h"
 
 #include "base/debug/crash_logging.h"
 #include "base/environment.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version.h"
 #include "chrome/common/env_vars.h"
+#include "chrome/installer/setup/installer_crash_keys.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/crash/core/common/crash_keys.h"
 
 InstallerCrashReporterClient::InstallerCrashReporterClient(
     bool is_per_user_install)
     : is_per_user_install_(is_per_user_install) {
 }
 
 InstallerCrashReporterClient::~InstallerCrashReporterClient() = default;
 
@@ skipping 91 matching lines @@
 }
 
 bool InstallerCrashReporterClient::GetCrashDumpLocation(
     base::FilePath* crash_dir) {
   // TODO(grt): Is there a reason to support the BREAKPAD_DUMP_LOCATION
   // environment variable?
   return PathService::Get(chrome::DIR_CRASH_DUMPS, crash_dir);
 }
 
 size_t InstallerCrashReporterClient::RegisterCrashKeys() {
-  const base::debug::CrashKey kKeys[] = {
-    { crash_keys::kClientId, crash_keys::kSmallSize },
-  };
-
-  return base::debug::InitCrashKeys(&kKeys[0], arraysize(kKeys),
+  std::vector<base::debug::CrashKey> keys;
+  installer::RegisterCrashKeys(keys);
+  return base::debug::InitCrashKeys(&keys.at(0), keys.size(),

[grt (UTC plus 2), 2015/11/26 19:24:45]

&keys.at(0) -> keys.data()

[Joe Mason, 2015/11/26 20:49:06]

Done.

                                     crash_keys::kChunkMaxLength);
 }
 
 bool InstallerCrashReporterClient::IsRunningUnattended() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   return env->HasVar(env_vars::kHeadless);
 }
 
 bool InstallerCrashReporterClient::GetCollectStatsConsent() {
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 34 matching lines @@
     }
   }
 
   return false;
 }
 
 bool InstallerCrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return true;
 }