Merge Crashpad to the 42.0.2311 branch

chrome/app/chrome_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 "chrome/app/chrome_crash_reporter_client.h"
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ skipping 62 matching lines @@
 // A atomic counter to make each crash dump value name unique.
 base::subtle::Atomic32 g_browser_crash_dump_count = 0;
 #endif
 
 }  // namespace
 
 ChromeCrashReporterClient::ChromeCrashReporterClient() {}
 
 ChromeCrashReporterClient::~ChromeCrashReporterClient() {}
 
+#if !defined(OS_MACOSX)
 void ChromeCrashReporterClient::SetCrashReporterClientIdFromGUID(
     const std::string& client_guid) {
-  crash_keys::SetCrashClientIdFromGUID(client_guid);
+  crash_keys::SetMetricsClientIdFromGUID(client_guid);
 }
+#endif
 
 #if defined(OS_WIN)
 bool ChromeCrashReporterClient::GetAlternativeCrashDumpLocation(
     base::FilePath* crash_dir) {
   // By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
   // location to write breakpad crash dumps can be set.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string alternate_crash_dump_location;
   if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
     *crash_dir = base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
@@ skipping 272 matching lines @@
 bool ChromeCrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return process_type == switches::kRendererProcess ||
          process_type == switches::kPluginProcess ||
          process_type == switches::kPpapiPluginProcess ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kGpuProcess;
 }
 
 }  // namespace chrome