Merge Crashpad to the 42.0.2311 branch

chrome/browser/resources/options/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
   <include src="reset_profile_settings_banner.html">
   <include src="automatic_settings_reset_banner.html">
 <if expr="chromeos">
   <include src="secondary_user_banner.html">
   <section>
     <div id="network-section-header" class="section-header">
@@ skipping 433 matching lines @@
 </if>
 <if expr="not chromeos">
         <label>
           <input id="metrics-reporting-enabled" type="checkbox">
           <span>
             <span i18n-content="enableLogging"></span>
             <span id="metrics-reporting-disabled-icon"
                 class="controlled-setting-indicator"></span>
           </span>
         </label>
-        <span id="metrics-reporting-reset-restart">
+        <span id="metrics-reporting-reset-restart" hidden>
           <!-- Text filled by JavaScript -->
           <span></span><a is="action-link" role="button"
               class="standalone-action-link"></a><span></span>
         </span>
 </if>
       </div>
       <div id="rappor-setting" class="checkbox controlled-setting-with-label">
         <label>
           <input pref="rappor.enabled" type="checkbox"
               metric="Options_RapporEnabledCheckbox">
@@ skipping 556 matching lines @@
       </button>
     </div>
   </section>
   </div>  <!-- advanced-settings-container -->
   </div>  <!-- advanced-settings -->
   <footer id="advanced-settings-footer">
     <a is="action-link" id="advanced-settings-expander"
         i18n-content="showAdvancedSettings"></a>
   </footer>
 </div>