Merge Crashpad to the 42.0.2311 branch

chrome/browser/ui/cocoa/first_run_dialog.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/first_run_dialog.h"
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "components/search_engines/template_url_service.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
-#import "components/crash/app/breakpad_mac.h"
 #endif
 
 @interface FirstRunDialogController (PrivateMethods)
 // Show the dialog.
 - (void)show;
 @end
 
 namespace {
 
 // Compare function for -[NSArray sortedArrayUsingFunction:context:] that
@@ skipping 52 matching lines @@
         [[FirstRunDialogController alloc] init]);
 
     [dialog.get() showWindow:nil];
     dialog_shown = true;
 
     // If the dialog asked the user to opt-in for stats and crash reporting,
     // record the decision and enable the crash reporter if appropriate.
     bool stats_enabled = [dialog.get() statsEnabled];
     GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled);
 
-    // Breakpad is normally enabled very early in the startup process.  However,
-    // on the first run it may not have been enabled due to the missing opt-in
-    // from the user.  If the user agreed now, enable breakpad if necessary.
-    if (!breakpad::IsCrashReporterEnabled() && stats_enabled) {
-      breakpad::InitCrashReporter(std::string());
-      breakpad::InitCrashProcessInfo(std::string());
-    }
-
     // If selected set as default browser.
     BOOL make_default_browser = [dialog.get() makeDefaultBrowser];
     if (make_default_browser) {
       bool success = ShellIntegration::SetAsDefaultBrowser();
       DCHECK(success);
     }
   }
 #else  // GOOGLE_CHROME_BUILD
   // We don't show the dialog in Chromium.
 #endif  // GOOGLE_CHROME_BUILD
@@ skipping 166 matching lines @@
   [NSApp stopModal];
 }
 
 - (IBAction)learnMore:(id)sender {
   NSString* urlStr = base::SysUTF8ToNSString(chrome::kLearnMoreReportingURL);
   NSURL* learnMoreUrl = [NSURL URLWithString:urlStr];
   [[NSWorkspace sharedWorkspace] openURL:learnMoreUrl];
 }
 
 @end