Implement new mock for user options page per chromium-os:5028

chrome/browser/resources/options.html

Index: chrome/browser/resources/options.html
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 4a764236a75bca5d3fd0bd66a53277f631553477..9579152b0b75ad843e98e3b9a97009e299fca5e5 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -26,7 +26,7 @@
   <script src="options/chromeos_system_options.js"></script>
   <script src="options/chromeos_accounts_options.js"></script>
   <script src="options/chromeos_accounts_user_list.js"></script>
-  <script src="options/chromeos_accounts_add_user_overlay.js"></script>
+  <script src="options/chromeos_accounts_user_name_edit.js"></script>
 </if>
 <script src="options/advanced_options.js"></script>
 <script src="options/browser_options.js"></script>
@@ -48,7 +48,6 @@ function load() {
 
   if (cr.isChromeOS) {
     OptionsPage.register(SystemOptions.getInstance());
-    OptionsPage.register(AccountsOptions.getInstance());
     // TODO(mazda): uncomment this once the language options is ready
     // OptionsPage.register(new OptionsPage(
     //     'languageChewing',
@@ -69,6 +68,7 @@ function load() {
   OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());
 
   if (cr.isChromeOS) {
+    OptionsPage.register(AccountsOptions.getInstance());
     var labsOptions = new OptionsPage('labs',
                                       localStrings.getString('labsPage'),
                                       'labsPage');
@@ -119,9 +119,6 @@ window.onpopstate = function(e) {
     <include src="options/add_startup_page_overlay.html">
     <include src="options/clear_browser_data_overlay.html">
     <include src="options/font_settings_overlay.html">
-    <if expr="pp_ifdef('chromeos')">
-       <include src="options/chromeos_accounts_add_user_overlay.html">
-    </if>
   </div>
 </div>
 <div id="main-content">