Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / session_login_browsertest.cc

diff --git a/src/chrome/browser/chromeos/login/session_login_browsertest.cc b/src/chrome/browser/chromeos/login/session_login_browsertest.cc
index 2fb4d40..cd97e8d 100644 (file)
--- a/src/chrome/browser/chromeos/login/session_login_browsertest.cc
+++ b/src/chrome/browser/chromeos/login/session_login_browsertest.cc
@@ -30,7 +30,7 @@ class BrowserLoginTest : public chromeos::LoginManagerTest {
   BrowserLoginTest() : LoginManagerTest(true) {}
   virtual ~BrowserLoginTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests);
   }
@@ -44,7 +44,8 @@ IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) {
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
+// Hangs flakily. See http://crbug.com/421453.
+IN_PROC_BROWSER_TEST_F(BrowserLoginTest, DISABLED_BrowserActive) {
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());