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

chrome/app/chrome_main_delegate.cc

 // 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.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 786 matching lines @@
       breakpad::InitNonBrowserCrashReporterForAndroid(process_type);
     }
 #else  // !defined(OS_ANDROID)
     breakpad::InitCrashReporter(process_type);
 #endif  // defined(OS_ANDROID)
   }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
-  crash_keys::SetSwitchesFromCommandLine(&command_line);
+  crash_keys::SetCrashKeysFromCommandLine(command_line);
 }
 
 void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
   // Note: If you are adding a new process type below, be sure to adjust the
   // AdjustLinuxOOMScore function too.
 #if defined(OS_LINUX)
   AdjustLinuxOOMScore(process_type);
 #endif
 #if defined(OS_WIN)
   InitLogging(process_type);
@@ skipping 109 matching lines @@
 
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line->GetSwitchValueASCII(switches::kProcessType);
   breakpad::InitCrashReporter(process_type);
 
   // Reset the command line for the newly spawned process.
-  crash_keys::SetSwitchesFromCommandLine(command_line);
+  crash_keys::SetCrashKeysFromCommandLine(*command_line);
 }
 
 #endif  // OS_MACOSX
 
 content::ContentBrowserClient*
 ChromeMainDelegate::CreateContentBrowserClient() {
 #if defined(CHROME_MULTIPLE_DLL_CHILD)
   return NULL;
 #else
   return g_chrome_content_browser_client.Pointer();
@@ skipping 32 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }