Merge Crashpad to the 42.0.2311 branch

components/crash/app/crash_reporter_client.cc

Index: components/crash/app/crash_reporter_client.cc
diff --git a/components/crash/app/crash_reporter_client.cc b/components/crash/app/crash_reporter_client.cc
index bdf3d90ec0e09f8636d51ccac0ee949b56f60615..57edf590406174d14f8834be34a88b8b1d303b51 100644
--- a/components/crash/app/crash_reporter_client.cc
+++ b/components/crash/app/crash_reporter_client.cc
@@ -27,9 +27,11 @@ CrashReporterClient* GetCrashReporterClient() {
 CrashReporterClient::CrashReporterClient() {}
 CrashReporterClient::~CrashReporterClient() {}
 
+#if !defined(OS_MACOSX)
 void CrashReporterClient::SetCrashReporterClientIdFromGUID(
     const std::string& client_guid) {
 }
+#endif
 
 #if defined(OS_WIN)
 bool CrashReporterClient::GetAlternativeCrashDumpLocation(
@@ -134,11 +136,6 @@ bool CrashReporterClient::ShouldEnableBreakpadMicrodumps() {
 }
 #endif
 
-#if defined(OS_MACOSX)
-void CrashReporterClient::InstallAdditionalFilters(BreakpadRef breakpad) {
-}
-#endif
-
 bool CrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return false;