Merge Crashpad to the 42.0.2311 branch

chrome/browser/google/google_update_settings_posix.cc

 // Copyright (c) 2011 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/installer/util/google_update_settings.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/chrome_paths.h"
 
+#if defined(OS_MACOSX)
+#include "components/crash/app/crashpad_mac.h"
+#endif
+
 namespace {
 
 base::LazyInstance<std::string>::Leaky g_posix_client_id =
     LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<base::Lock>::Leaky g_posix_client_id_lock =
     LAZY_INSTANCE_INITIALIZER;
 
 // File name used in the user data dir to indicate consent.
 const char kConsentToSendStats[] = "Consent To Send Stats";
 
@@ skipping 26 matching lines @@
     SetConsentFilePermissionIfNeeded(consent_file);
 
     base::AutoLock lock(g_posix_client_id_lock.Get());
     g_posix_client_id.Get().assign(tmp_guid);
   }
   return consented;
 }
 
 // static
 bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
+#if defined(OS_MACOSX)
+  crash_reporter::SetUploadsEnabled(consented);
+#endif
+
   base::FilePath consent_dir;
   PathService::Get(chrome::DIR_USER_DATA, &consent_dir);
   if (!base::DirectoryExists(consent_dir))
     return false;
 
   base::AutoLock lock(g_posix_client_id_lock.Get());
 
   base::FilePath consent_file = consent_dir.AppendASCII(kConsentToSendStats);
   if (!consented) {
     g_posix_client_id.Get().clear();
@@ skipping 47 matching lines @@
 
 // static
 int GoogleUpdateSettings::GetLastRunTime() {
   return -1;
 }
 
 // static
 bool GoogleUpdateSettings::SetLastRunTime() {
   return false;
 }