[uber page] Merge advanced options page into browser options.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
===================================================================
--- chrome/app/generated_resources.grd	(revision 124004)
+++ chrome/app/generated_resources.grd	(working copy)
@@ -8131,6 +8131,12 @@
       <message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab.">
         Settings
       </message>
+      <message name="IDS_SETTINGS_HIDE_ADVANCED_SETTINGS" desc="Title for the link to hide advanced settings.">
+        Hide advanced settings...
+      </message>
+      <message name="IDS_SETTINGS_SHOW_ADVANCED_SETTINGS" desc="Title for the link to show advanced settings.">
+        Show advanced settings...
+      </message>
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_OPTIONS_SYSTEM_TAB_LABEL" desc="The title of the System tab">
           System
@@ -8163,9 +8169,6 @@
       <message name="IDS_OPTIONS_ADVANCED_TAB_LABEL" desc="The title of the Under the Hood tab">
         Under the Hood
       </message>
-      <message name="IDS_OPTIONS2_ADVANCED_TAB_LABEL" desc="The title of the Advanced settings tab">
-        Advanced Settings
-      </message>
       <message name="IDS_OPTIONS_TAB_TITLE" desc="The format of the title on the browser tab for an options subpage, e.g. Settings - Basics">
         <ph name="OPTIONS_TITLE">$1<ex>Settings</ex></ph> - <ph name="SUBPAGE_TITLE">$2<ex>Under the Hood</ex></ph>
       </message>
@@ -8419,18 +8422,7 @@
         </message>
       </if>
 
-      <if expr="not pp_ifdef('use_titlecase')">
-        <message name="IDS_OPTIONS_ADVANCED_BUTTON_TITLE" desc="The title of the advanced options button">
-          Advanced settings...
-        </message>
-      </if>
       <if expr="pp_ifdef('use_titlecase')">
-        <message name="IDS_OPTIONS_ADVANCED_BUTTON_TITLE" desc="In Title Case: The title of the advanced options button">
-          Advanced Settings...
-        </message>
-      </if>
-
-      <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT" desc="In Title Case: The label of the 'Use Chrome as default' browser button">
           Make <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> My Default Browser
         </message>
@@ -10043,11 +10035,6 @@
         Choose Another Directory...
       </message>
 
-      <!-- Advanced subpage back button -->
-      <message name="IDS_OPTIONS_ADVANCED_SECTION_BACK_BUTTON">
-        Return to settings...
-      </message>
-
       <!-- Advanced Section Titles -->
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY">
         Privacy