Revert 275229 "Add an extension override bubble and warning box ..."

trunk/src/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 11 matching lines @@
         </label>
       </div>
       <div id="network-menus"></div>
     </div>
   </section>
 </if>
 <if expr="not chromeos">
   <include src="sync_section.html">
   <include src="startup_section.html">
 </if>
-  <section id="proxy-section" hidden>
-    <h3 i18n-content="sectionTitleProxy"></h3>
-    <div id="proxy-section-content"></div>
-  </section>
-
   <section>
     <h3 i18n-content="sectionTitleAppearance"></h3>
     <div class="settings-row">
 <if expr="chromeos">
       <button id="set-wallpaper" i18n-content="setWallpaper"
           guest-visibility="disabled"></button>
       <span id="wallpaper-indicator" class="controlled-setting-indicator">
       </span>
 </if>
 <if expr="not chromeos and is_posix and not is_macosx">
@@ skipping 507 matching lines @@
           <span i18n-content="tabsToLinksPref"></span>
         </label>
       </div>
 </if>
     </div>
   </section>
 <if expr="not chromeos">
   <section id="network-section">
     <h3 i18n-content="advancedSectionTitleNetwork"></h3>
     <div>
-      <span id="proxiesLabel"
-            class="settings-row"
-            i18n-content="proxiesLabelSystem"></span>
+      <span id="proxiesLabel" class="settings-row"></span>
       <div class="settings-row">
         <button id="proxiesConfigureButton"
             i18n-content="proxiesConfigureButton"></button>
         <span class="controlled-setting-indicator" pref="proxy" plural></span>
       </div>
     </div>
   </section>
 </if>
   <section id="languages-section">
     <h3 i18n-content="advancedSectionTitleLanguages"></h3>
@@ skipping 356 matching lines @@
     </div>
   </section>
   </div>  <!-- advanced-settings-container -->
   </div>  <!-- advanced-settings -->
   <footer>
     <button id="advanced-settings-expander" class="link-button"
         i18n-content="showAdvancedSettings">
     </button>
   </footer>
   </div>