Lots of small fixes to help wire things together for the 0.8 upgrade.

chrome/browser/resources/settings/settings_main/settings_main.html

Index: chrome/browser/resources/settings/settings_main/settings_main.html
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index 242375af5ac5aa2ce877ec70ac66ae9a4cc2bbc6..2ca01ef129755f089173d3b84f47e74f197e4787 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -1,15 +1,15 @@
 <link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.html">
 <link rel="import" href="chrome://md-settings/routes.html">
-
-<!-- TODO: Uncomment pages as they are upgraded.
 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html">
 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html">
-<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
-<link rel="import" href="chrome://md-settings/internet_page/internet_detail_page.html">
 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines_page.html">
 <link rel="import" href="chrome://md-settings/search_page/search_page.html">
+
+<!-- TODO: Uncomment pages as they are upgraded.
+<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
+<link rel="import" href="chrome://md-settings/internet_page/internet_detail_page.html">
 -->
 
 <dom-module id="cr-settings-main">
@@ -34,29 +34,19 @@
           </cr-settings-internet-detail-page>
           -->
 </if>
-          <!--
           <cr-settings-a11y-page prefs="{{prefs}}" route="a11y">
           </cr-settings-a11y-page>
-          -->
 <if expr="chromeos">
-          <!--
           <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">
           </cr-settings-date-time-page>
 </if>
-          -->
-          <!--
           <cr-settings-downloads-page prefs="{{prefs}}" route="downloads">
           </cr-settings-downloads-page>
-          -->
-          <!--
           <cr-settings-search-page prefs="{{prefs}}" route="search">
           </cr-settings-search-page>
-          -->
-          <!--
           <cr-settings-search-engines-page prefs="{{prefs}}"
               route="search-engines">
           </cr-settings-search-engines-page>
-          -->
         </iron-pages>
       </more-route-selector>
     </div>