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

chrome/browser/chromeos/mock_cros_settings.cc

Index: chrome/browser/chromeos/mock_cros_settings.cc
diff --git a/chrome/browser/chromeos/mock_cros_settings.cc b/chrome/browser/chromeos/mock_cros_settings.cc
index 5cec06688374db57f45dc6dead78db7371ee2928..36aa9c19d77f62fedc418fcbbbc49b1e7a6b3a8f 100644
--- a/chrome/browser/chromeos/mock_cros_settings.cc
+++ b/chrome/browser/chromeos/mock_cros_settings.cc
@@ -11,15 +11,20 @@ MockCrosSettings::MockCrosSettings()
   // Some mock settings
   SetBoolean(kAccountsPrefAllowBWSI, true);
   SetBoolean(kAccountsPrefAllowGuest, true);
+  SetBoolean(kAccountsPrefShowUserNamesOnSignIn, true);
 
   ListValue* user_list = new ListValue;
 
   DictionaryValue* mock_user = new DictionaryValue;
   mock_user->SetString(L"email", L"mock_user_1@gmail.com");
+  mock_user->SetString(L"name", L"Mock User One");
+  mock_user->SetBoolean(L"owner", true);
   user_list->Append(mock_user);
 
   mock_user = new DictionaryValue;
   mock_user->SetString(L"email", L"mock_user_2@gmail.com");
+  mock_user->SetString(L"name", L"Mock User Two");
+  mock_user->SetBoolean(L"owner", false);
   user_list->Append(mock_user);
 
   Set(kAccountsPrefUsers, user_list);