Merge Crashpad to the 42.0.2311 branch

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 8ba30db451adb4a6e9fa9894aecb30507daa4993..aeb2c34a339cace86d7e16d645fb51e4d22ea317 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -462,20 +462,21 @@ cr.define('options', function() {
         restartElements[1].onclick = function(event) {
           chrome.send('restartBrowser');
         };
-        // Attach the listener for updating the checkbox and restart button.
-        var updateMetricsRestartButton = function() {
-          $('metrics-reporting-reset-restart').hidden =
-              loadTimeData.getBoolean('metricsReportingEnabledAtStart') ==
-                  $('metrics-reporting-enabled').checked;
-        };
         $('metrics-reporting-enabled').onclick = function(event) {
           chrome.send('metricsReportingCheckboxChanged',
               [Boolean(event.currentTarget.checked)]);
-          updateMetricsRestartButton();
+          if (cr.isMac) {
+            // A browser restart is never needed to toggle metrics reporting,
+            // and is only needed to toggle crash reporting when using Breakpad.
+            // Crashpad, used on Mac, does not require a browser restart.
+            return;
+          }
+          $('metrics-reporting-reset-restart').hidden =
+              loadTimeData.getBoolean('metricsReportingEnabledAtStart') ==
+                  $('metrics-reporting-enabled').checked;
         };
         $('metrics-reporting-enabled').checked =
             loadTimeData.getBoolean('metricsReportingEnabledAtStart');
-        updateMetricsRestartButton();
       }
       // 'rappor-setting' element is only present on Chrome branded builds.
       if ($('rappor-setting')) {