Clean up and unify IsBoringSwitch().

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/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 "content/public/common/content_switches.h"
+#include "ipc/ipc_switches.h"
 
 #if defined(OS_MACOSX)
 #include "breakpad/src/common/simple_string_dictionary.h"
 #elif defined(OS_WIN)
 #include "breakpad/src/client/windows/common/ipc_protocol.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/common/chrome_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 #endif
@@ skipping 250 matching lines @@
   //
   // Breakpad cannot be enabled or disabled without an application restart, and
   // it needs to use the metrics client ID as its stable crash client ID, so
   // leave its client ID intact even when metrics reporting is disabled while
   // the application is running.
   base::debug::ClearCrashKey(kMetricsClientId);
 #endif
 }
 
 static bool IsBoringSwitch(const std::string& flag) {
+  static const char* const kIgnoreSwitches[] = {
+    switches::kEnableLogging,
+    switches::kFlagSwitchesBegin,
+    switches::kFlagSwitchesEnd,
+    switches::kLoggingLevel,
+    switches::kProcessChannelID,
+    switches::kProcessType,
+    switches::kV,
+    switches::kVModule,
 #if defined(OS_WIN)
-  return StartsWithASCII(flag, "--channel=", true) ||
-
-         // No point to including this since we already have a ptype field.
-         StartsWithASCII(flag, "--type=", true) ||
-
-         // Not particularly interesting
-         StartsWithASCII(flag, "--flash-broker=", true) ||
-
-         // Just about everything has this, don't bother.
-         StartsWithASCII(flag, "/prefetch:", true) ||
-
-         // We handle the plugin path separately since it is usually too big
-         // to fit in the switches (limited to 63 characters).
-         StartsWithASCII(flag, "--plugin-path=", true) ||
-
-         // This is too big so we end up truncating it anyway.
-         StartsWithASCII(flag, "--force-fieldtrials=", true) ||
-
-         // These surround the flags that were added by about:flags, it lets
-         // you distinguish which flags were added manually via the command
-         // line versus those added through about:flags. For the most part
-         // we don't care how an option was enabled, so we strip these.
-         // (If you need to know can always look at the PEB).
-         flag == "--flag-switches-begin" ||
-         flag == "--flag-switches-end";
+    switches::kForceFieldTrials,
+    switches::kPluginPath,
 #elif defined(OS_MACOSX)
-  // These are carried in their own fields.
-  return StartsWithASCII(flag, "--channel=", true) ||
-         StartsWithASCII(flag, "--type=", true) ||
-         StartsWithASCII(flag, "--metrics-client-id=", true);
+    switches::kMetricsClientId,
 #elif defined(OS_CHROMEOS)
-  static const char* const kIgnoreSwitches[] = {
-    ::switches::kEnableLogging,
-    ::switches::kFlagSwitchesBegin,
-    ::switches::kFlagSwitchesEnd,
-    ::switches::kLoggingLevel,
-    ::switches::kPpapiFlashArgs,
-    ::switches::kPpapiFlashPath,
-    ::switches::kRegisterPepperPlugins,
-    ::switches::kUIPrioritizeInGpuProcess,
-    ::switches::kUseGL,
-    ::switches::kUserDataDir,
-    ::switches::kV,
-    ::switches::kVModule,
+    switches::kPpapiFlashArgs,
+    switches::kPpapiFlashPath,
+    switches::kRegisterPepperPlugins,
+    switches::kUIPrioritizeInGpuProcess,
+    switches::kUseGL,
+    switches::kUserDataDir,
     // Cros/CC flgas are specified as raw strings to avoid dependency.
     "child-wallpaper-large",
     "child-wallpaper-small",
     "default-wallpaper-large",
     "default-wallpaper-small",
     "guest-wallpaper-large",
     "guest-wallpaper-small",
     "enterprise-enable-forced-re-enrollment",
     "enterprise-enrollment-initial-modulus",
     "enterprise-enrollment-modulus-limit",
     "login-profile",
     "login-user",
     "max-tiles-for-interest-area",
     "max-unused-resource-memory-usage-percentage",
     "termination-message-file",
     "use-cras",
+#endif
   };
+
+#if defined(OS_WIN)
+  // Just about everything has this, don't bother.
+  if (StartsWithASCII("/prefetch:"))

[Lei Zhang, 2015/04/16 18:24:32]

err, looks like you are missing a couple arguments.

[Robert Sesek, 2015/04/16 22:00:29]

Oops, got a bit aggressive with the deleting there.

+    return true;
+#endif
+
   if (!StartsWithASCII(flag, "--", true))
     return false;
-  std::size_t end = flag.find("=");
+  size_t end = flag.find("=");
   int len = (end == std::string::npos) ? flag.length() - 2 : end - 2;

[Lei Zhang, 2015/04/16 18:24:32]

and this probably needs to be a size_t

[Robert Sesek, 2015/04/16 22:00:29]

Done.

   for (size_t i = 0; i < arraysize(kIgnoreSwitches); ++i) {
     if (flag.compare(2, len, kIgnoreSwitches[i]) == 0)
       return true;
   }
   return false;
-#else
-  return false;
-#endif
 }
 
 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.
@@ skipping 76 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