Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / options / chromeos / accounts_options_browsertest.cc

diff --git a/src/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/src/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
index ac97ad2..c2cf123 100644 (file)
--- a/src/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
+++ b/src/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
@@ -90,7 +90,7 @@ class AccountsOptionsTest : public LoginManagerTest {
         "var e = document.getElementById('allowBwsiCheck');"
         "window.domAutomationController.send(!e.disabled);",
         &guest_option_enabled));
-    ASSERT_EQ(is_owner, guest_option_enabled);
+    EXPECT_EQ(is_owner, guest_option_enabled);
 
     bool user_pods_enabled;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -98,7 +98,7 @@ class AccountsOptionsTest : public LoginManagerTest {
         "var e = document.getElementById('showUserNamesCheck');"
         "window.domAutomationController.send(!e.disabled);",
         &user_pods_enabled));
-    ASSERT_EQ(is_owner, user_pods_enabled);
+    EXPECT_EQ(is_owner, user_pods_enabled);
 
     bool whitelist_enabled;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -106,7 +106,7 @@ class AccountsOptionsTest : public LoginManagerTest {
         "var e = document.getElementById('useWhitelistCheck');"
         "window.domAutomationController.send(!e.disabled);",
         &whitelist_enabled));
-    ASSERT_EQ(is_owner, whitelist_enabled);
+    EXPECT_EQ(is_owner, whitelist_enabled);
   }
 
   StubCrosSettingsProvider stub_settings_provider_;
@@ -122,7 +122,9 @@ IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) {
   StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {
+// TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed.
+IN_PROC_BROWSER_TEST_F(AccountsOptionsTest,
+                       DISABLED_MultiProfilesAccountsOptions) {
   LoginUser(kTestUsers[0]);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();