Move crash keys for command-line switches to components/crash so they can be set

chrome/installer/setup/installer_crash_reporting.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_reporting.h"
 
+#include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/installer/setup/installer_crash_reporter_client.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/installer_state.h"
 #include "components/crash/content/app/breakpad_win.h"
 #include "components/crash/content/app/crash_keys_win.h"
@@ skipping 103 matching lines @@
     { kIsMultiInstall, crash_keys::kSmallSize },
     { kIsSystemLevel, crash_keys::kSmallSize },
     { kOperation, crash_keys::kSmallSize },
 
     // This is a Windows registry key, which maxes out at 255 chars.
     // (kMediumSize actually maxes out at 252 chars on Windows, but potentially
     // truncating such a small amount is a fair tradeoff compared to using
     // kLargeSize, which is wasteful.)
     { kStateKey, crash_keys::kMediumSize },
   };
-  return base::debug::InitCrashKeys(&kFixedKeys[0], arraysize(kFixedKeys),
+  std::vector<base::debug::CrashKey> keys(std::begin(kFixedKeys),

[grt (UTC plus 2), 2015/11/28 02:04:30]

#include <iterator> for std::begin and std::end
#include <vector> for std::vector

[Joe Mason, 2015/11/30 17:23:55]

Done.

+                                          std::end(kFixedKeys));
+  crash_keys::GetCrashKeysForCommandLineSwitches(&keys);
+  return base::debug::InitCrashKeys(keys.data(), keys.size(),
                                     crash_keys::kChunkMaxLength);
 }
 
 void SetInitialCrashKeys(const InstallerState& state) {
   using base::debug::SetCrashKeyValue;
 
   SetCrashKeyValue(kDistributionType,
                    DistributionTypeToString(state.state_type()));
   SetCrashKeyValue(kOperation, OperationToString(state.operation()));
   SetCrashKeyValue(kIsMultiInstall,
                    state.is_multi_install() ? "true" : "false");
   SetCrashKeyValue(kIsSystemLevel, state.system_install() ? "true" : "false");
 
   const base::string16 state_key = state.state_key();
   if (!state_key.empty())
     SetCrashKeyValue(kStateKey, base::UTF16ToUTF8(state_key));
 }
 
+void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
+  crash_keys::SetSwitchesFromCommandLine(command_line, nullptr);
+}
+
 }  // namespace installer