Merge Crashpad to the 42.0.2311 branch

components/crash/app/crash_reporter_client.cc

 // 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.
 
 #include "components/crash/app/crash_reporter_client.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 
 namespace crash_reporter {
 
 namespace {
 
 CrashReporterClient* g_client = NULL;
 
 }  // namespace
 
 void SetCrashReporterClient(CrashReporterClient* client) {
   g_client = client;
 }
 
 CrashReporterClient* GetCrashReporterClient() {
   DCHECK(g_client);
   return g_client;
 }
 
 CrashReporterClient::CrashReporterClient() {}
 CrashReporterClient::~CrashReporterClient() {}
 
+#if !defined(OS_MACOSX)
 void CrashReporterClient::SetCrashReporterClientIdFromGUID(
     const std::string& client_guid) {
 }
+#endif
 
 #if defined(OS_WIN)
 bool CrashReporterClient::GetAlternativeCrashDumpLocation(
     base::FilePath* crash_dir) {
   return false;
 }
 
 void CrashReporterClient::GetProductNameAndVersion(
     const base::FilePath& exe_path,
     base::string16* product_name,
@@ skipping 84 matching lines @@
 // on Android we attach a secondary crash handler which serializes a reduced
 // form of logcat on the console.
 #if defined(NO_UNWIND_TABLES)
   return true;
 #else
   return false;
 #endif
 }
 #endif
 
-#if defined(OS_MACOSX)
-void CrashReporterClient::InstallAdditionalFilters(BreakpadRef breakpad) {
-}
-#endif
-
 bool CrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return false;
 }
 
 }  // namespace crash_reporter