Merge Crashpad to the 42.0.2311 branch

components/crash/app/breakpad_mac.mm

Index: components/crash/app/breakpad_mac.mm
diff --git a/components/crash/app/breakpad_mac.mm b/components/crash/app/breakpad_mac.mm
index deb7524d1655a04874765090ef4b235c0f273def..f435483fee4d643705940f18e37ee9cb21f8314c 100644
--- a/components/crash/app/breakpad_mac.mm
+++ b/components/crash/app/breakpad_mac.mm
@@ -252,13 +252,6 @@ void InitCrashReporter(const std::string& process_type) {
   SetCrashKeyValue(@"prod", [info_dictionary objectForKey:@BREAKPAD_PRODUCT]);
   SetCrashKeyValue(@"plat", @"OS X");
 
-  if (!is_browser) {
-    // Get the guid from the command line switch.
-    std::string client_guid =
-        command_line->GetSwitchValueASCII(switches::kEnableCrashReporter);
-    GetCrashReporterClient()->SetCrashReporterClientIdFromGUID(client_guid);
-  }
-
   logging::SetLogMessageHandler(&FatalMessageHandler);
   base::debug::SetDumpWithoutCrashingFunction(&DumpHelper::DumpWithoutCrashing);
 
@@ -282,8 +275,6 @@ void InitCrashProcessInfo(const std::string& process_type_switch) {
     process_type = base::SysUTF8ToNSString(process_type_switch);
   }
 
-  GetCrashReporterClient()->InstallAdditionalFilters(gBreakpadRef);
-
   // Store process type in crash dump.
   SetCrashKeyValue(@"ptype", process_type);