Merge Crashpad to the 42.0.2311 branch

components/crash/app/crash_reporter_client.h

Index: components/crash/app/crash_reporter_client.h
diff --git a/components/crash/app/crash_reporter_client.h b/components/crash/app/crash_reporter_client.h
index 578cb872eaa419fdf9380ceb798b0620633b34bf..cff8b7e703e46ebde8de38807889c48eb1fd1da6 100644
--- a/components/crash/app/crash_reporter_client.h
+++ b/components/crash/app/crash_reporter_client.h
@@ -45,11 +45,16 @@ class CrashReporterClient {
   CrashReporterClient();
   virtual ~CrashReporterClient();
 
+#if !defined(OS_MACOSX)
   // Sets the crash reporting client ID, a unique identifier for the client
   // that is sending crash reports. After it is set, it should not be changed.
   // |client_guid| may either be a full GUID or a GUID that was already stripped
   // from its dashes.
+  //
+  // On Mac OS X, this is the responsibility of Crashpad, and can not be set
+  // directly by the client.
   virtual void SetCrashReporterClientIdFromGUID(const std::string& client_guid);
+#endif
 
 #if defined(OS_WIN)
   // Returns true if an alternative location to store the minidump files was
@@ -141,11 +146,6 @@ class CrashReporterClient {
   virtual bool ShouldEnableBreakpadMicrodumps();
 #endif
 
-#if defined(OS_MACOSX)
-  // Install additional breakpad filter callbacks.
-  virtual void InstallAdditionalFilters(BreakpadRef breakpad);
-#endif
-
   // Returns true if breakpad should run in the given process type.
   virtual bool EnableBreakpadForProcess(const std::string& process_type);
 };