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

chrome/common/crash_keys.cc

 // Copyright (c) 2013 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/crash_keys.h"
 
 #include "base/base_switches.h"
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/flags_ui/flags_ui_switches.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/common/chrome_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 #endif
 
 namespace crash_keys {
 
 const char kActiveURL[] = "url-chunk";
 
 const char kFontKeyName[] = "font_key_name";
 
-const char kSwitch[] = "switch-%" PRIuS;
-const char kNumSwitches[] = "num-switches";
-
 const char kExtensionID[] = "extension-%" PRIuS;
 const char kNumExtensionsCount[] = "num-extensions";
 
 const char kShutdownType[] = "shutdown-type";
 
 #if !defined(OS_ANDROID)
 const char kGPUVendorID[] = "gpu-venid";
 const char kGPUDeviceID[] = "gpu-devid";
 #endif
 const char kGPUDriverVersion[] = "gpu-driver";
@@ skipping 42 matching lines @@
   // The following keys may be chunked by the underlying crash logging system,
   // but ultimately constitute a single key-value pair.
   base::debug::CrashKey fixed_keys[] = {
 #if defined(OS_MACOSX)
     { kMetricsClientId, kSmallSize },
 #else
     { kClientId, kSmallSize },
 #endif
     { kChannel, kSmallSize },
     { kActiveURL, kLargeSize },
-    { kNumSwitches, kSmallSize },
     { kNumVariations, kSmallSize },
     { kVariations, kLargeSize },
     { kNumExtensionsCount, kSmallSize },
     { kShutdownType, kSmallSize },
 #if !defined(OS_ANDROID)
     { kGPUVendorID, kSmallSize },
     { kGPUDeviceID, kSmallSize },
 #endif
     { kGPUDriverVersion, kSmallSize },
     { kGPUPixelShaderVersion, kSmallSize },
@@ skipping 39 matching lines @@
     { kBug464926CrashKey, kSmallSize },
     { kViewCount, kSmallSize },
     { kZeroEncodeDetails, kSmallSize },
   };
 
   // This dynamic set of keys is used for sets of key value pairs when gathering
   // a collection of data, like command line switches or extension IDs.
   std::vector<base::debug::CrashKey> keys(
       fixed_keys, fixed_keys + arraysize(fixed_keys));
 
-  // Register the switches.
-  {
-    // The fixed_keys names are string constants. Use static storage for
-    // formatted key names as well, since they will persist for the duration of
-    // the program.
-    static char formatted_keys[kSwitchesMaxCount][sizeof(kSwitch) + 1] =
-        {{ 0 }};
-    const size_t formatted_key_len = sizeof(formatted_keys[0]);
-    for (size_t i = 0; i < kSwitchesMaxCount; ++i) {
-      // Name the keys using 1-based indexing.
-      int n = base::snprintf(
-          formatted_keys[i], formatted_key_len, kSwitch, i + 1);
-      DCHECK_GT(n, 0);
-      base::debug::CrashKey crash_key = { formatted_keys[i], kSmallSize };
-      keys.push_back(crash_key);
-    }
-  }
+  crash_keys::GetCrashKeysForCommandLineSwitches(&keys);
 
   // Register the extension IDs.
   {
     static char formatted_keys[kExtensionIDMaxCount][sizeof(kExtensionID) + 1] =
         {{ 0 }};
     const size_t formatted_key_len = sizeof(formatted_keys[0]);
     for (size_t i = 0; i < kExtensionIDMaxCount; ++i) {
       int n = base::snprintf(
           formatted_keys[i], formatted_key_len, kExtensionID, i + 1);
       DCHECK_GT(n, 0);
@@ skipping 81 matching lines @@
     if (flag.compare(2, len, kIgnoreSwitches[i]) == 0)
       return true;
   }
   return false;
 }
 
 void SetSwitchesFromCommandLine(const base::CommandLine* command_line) {
   DCHECK(command_line);
   if (!command_line)
     return;
-
-  const base::CommandLine::StringVector& argv = command_line->argv();
-
-  // Set the number of switches in case size > kNumSwitches.
-  base::debug::SetCrashKeyValue(kNumSwitches,
-      base::StringPrintf("%" PRIuS, argv.size() - 1));
-
-  size_t key_i = 1;  // Key names are 1-indexed.
-
-  // Go through the argv, skipping the exec path.
-  for (size_t i = 1; i < argv.size(); ++i) {
-#if defined(OS_WIN)
-    std::string switch_str = base::WideToUTF8(argv[i]);
-#else
-    std::string switch_str = argv[i];
-#endif
-
-    // Skip uninteresting switches.
-    if (IsBoringSwitch(switch_str))
-      continue;
-
-    // Stop if there are too many switches.
-    if (i > crash_keys::kSwitchesMaxCount)
-      break;
-
-    std::string key = base::StringPrintf(kSwitch, key_i++);
-    base::debug::SetCrashKeyValue(key, switch_str);
-  }
-
-  // Clear any remaining switches.
-  for (; key_i <= kSwitchesMaxCount; ++key_i) {
-    base::debug::ClearCrashKey(base::StringPrintf(kSwitch, key_i));
-  }
+  return SetSwitchesFromCommandLine(*command_line,

[grt (UTC plus 2), 2015/11/27 18:51:21]

hmm, the name collision here is a bit confusing. wdyt of naming the one in
components/crash something like SetFilteredSwitchesFromCommandLine? ooh, i like
SetCrashKeysFromCommandLine in installer. how about using that here, too?

[Joe Mason, 2015/11/27 21:16:47]

Done.

+                                    base::Bind(&IsBoringSwitch));
 }
 
 void SetActiveExtensions(const std::set<std::string>& extensions) {
   base::debug::SetCrashKeyValue(kNumExtensionsCount,
       base::StringPrintf("%" PRIuS, extensions.size()));
 
   std::set<std::string>::const_iterator it = extensions.begin();
   for (size_t i = 0; i < kExtensionIDMaxCount; ++i) {
     std::string key = base::StringPrintf(kExtensionID, i + 1);
     if (it == extensions.end()) {
@@ skipping 18 matching lines @@
 }
 
 ScopedPrinterInfo::~ScopedPrinterInfo() {
   for (size_t i = 0; i < kPrinterInfoCount; ++i) {
     std::string key = base::StringPrintf(kPrinterInfo, i + 1);
     base::debug::ClearCrashKey(key);
   }
 }
 
 }  // namespace crash_keys