Clarify settings UI in multi-profiles mode

chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

Index: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
similarity index 67%
copy from chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
copy to chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
index 33fbebf48eee55af32f60853983fe466a64d913d..47e2f04b0de78e49d4ba98dacc62dad00310d346 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
@@ -30,15 +30,15 @@ const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
 
 }  // namespace
 
-class AccountsOptionsTest : public LoginManagerTest {
+class SharedOptionsTest : public LoginManagerTest {
  public:
-  AccountsOptionsTest()
+  SharedOptionsTest()
     : LoginManagerTest(false),
       device_settings_provider_(NULL) {
     stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0]));
   }
 
-  virtual ~AccountsOptionsTest() {
+  virtual ~SharedOptionsTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ -63,7 +63,7 @@ class AccountsOptionsTest : public LoginManagerTest {
   }
 
  protected:
-  void CheckAccountsUI(const User* user, bool is_owner) {
+  void CheckOptionsUI(const User* user, bool is_primary) {
     Profile* profile = UserManager::Get()->GetProfileByUser(user);
     profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                    user->email());
@@ -73,58 +73,34 @@ class AccountsOptionsTest : public LoginManagerTest {
     observer.WaitForSingleNewBrowser();
 
     ui_test_utils::NavigateToURL(browser,
-                                 GURL("chrome://settings-frame/accounts"));
+                                 GURL("chrome://settings-frame"));
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
 
-    bool warning_visible;
+    bool banner_visible;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         contents,
-        "var e = document.getElementById('ownerOnlyWarning');"
+        "var e = document.getElementById('secondary-user-banner');"
         "var visible = e.offsetWidth > 0 && e.offsetHeight > 0;"
         "window.domAutomationController.send(visible);",
-        &warning_visible));
-    EXPECT_EQ(is_owner, !warning_visible);
-
-    bool guest_option_enabled;
-    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-        contents,
-        "var e = document.getElementById('allowBwsiCheck');"
-        "window.domAutomationController.send(!e.disabled);",
-        &guest_option_enabled));
-    ASSERT_EQ(is_owner, guest_option_enabled);
-
-    bool user_pods_enabled;
-    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-        contents,
-        "var e = document.getElementById('showUserNamesCheck');"
-        "window.domAutomationController.send(!e.disabled);",
-        &user_pods_enabled));
-    ASSERT_EQ(is_owner, user_pods_enabled);
-
-    bool whitelist_enabled;
-    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-        contents,
-        "var e = document.getElementById('useWhitelistCheck');"
-        "window.domAutomationController.send(!e.disabled);",
-        &whitelist_enabled));
-    ASSERT_EQ(is_owner, whitelist_enabled);
+        &banner_visible));
+    EXPECT_EQ(is_primary, !banner_visible);
   }
 
   StubCrosSettingsProvider stub_settings_provider_;
   CrosSettingsProvider* device_settings_provider_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest);
+  DISALLOW_COPY_AND_ASSIGN(SharedOptionsTest);
 };
 
-IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) {
+IN_PROC_BROWSER_TEST_F(SharedOptionsTest, PRE_SharedOptions) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {
+IN_PROC_BROWSER_TEST_F(SharedOptionsTest, SharedOptions) {
   LoginUser(kTestUsers[0]);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
@@ -133,8 +109,8 @@ IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {
   UserManager* manager = UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
 
-  CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
-  CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
+  CheckOptionsUI(manager->FindUser(kTestUsers[0]), true /* is_primary */);
+  CheckOptionsUI(manager->FindUser(kTestUsers[1]), false /* is_primary */);
 }
 
 }  // namespace chromeos