Merge Crashpad to the 42.0.2311 branch

components/crash/app/breakpad_mac.mm

 // Copyright 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.
 
 #import "components/crash/app/breakpad_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/auto_reset.h"
@@ skipping 234 matching lines @@
   base::debug::SetCrashKeyReportingFunctions(&SetCrashKeyValueImpl,
                                              &ClearCrashKeyValueImpl);
   GetCrashReporterClient()->RegisterCrashKeys();
 
   // Set Breakpad metadata values.  These values are added to Info.plist during
   // the branded Google Chrome.app build.
   SetCrashKeyValue(@"ver", [info_dictionary objectForKey:@BREAKPAD_VERSION]);
   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);
 
   // abort() sends SIGABRT, which breakpad does not intercept.
   // Register a signal handler to crash in a way breakpad will
   // intercept.
   struct sigaction sigact;
   memset(&sigact, 0, sizeof(sigact));
   sigact.sa_handler = SIGABRTHandler;
   CHECK(0 == sigaction(SIGABRT, &sigact, NULL));
 }
 
 void InitCrashProcessInfo(const std::string& process_type_switch) {
   if (gBreakpadRef == NULL) {
     return;
   }
 
   // Determine the process type.
   NSString* process_type = @"browser";
   if (!process_type_switch.empty()) {
     process_type = base::SysUTF8ToNSString(process_type_switch);
   }
 
-  GetCrashReporterClient()->InstallAdditionalFilters(gBreakpadRef);
-
   // Store process type in crash dump.
   SetCrashKeyValue(@"ptype", process_type);
 
   NSString* pid_value =
       [NSString stringWithFormat:@"%d", static_cast<unsigned int>(getpid())];
   SetCrashKeyValue(@"pid", pid_value);
 }
 
 }  // namespace breakpad