Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / easy_unlock_service_browsertest_chromeos.cc

diff --git a/src/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc b/src/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
index 89b2b72..10f5f07 100644 (file)
--- a/src/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
+++ b/src/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
@@ -98,7 +98,7 @@ class EasyUnlockServiceTest : public InProcessBrowserTest {
 #endif
 
   // InProcessBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     EXPECT_CALL(provider_, IsInitializationComplete(_))
         .WillRepeatedly(Return(true));
     policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
@@ -149,7 +149,7 @@ class EasyUnlockServiceNoBluetoothTest : public EasyUnlockServiceTest {
   virtual ~EasyUnlockServiceNoBluetoothTest() {}
 
   // InProcessBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     set_is_bluetooth_adapter_present(false);
     EasyUnlockServiceTest::SetUpInProcessBrowserTestFixture();
   }
@@ -171,7 +171,7 @@ class EasyUnlockServiceFinchEnabledTest : public EasyUnlockServiceTest {
   virtual ~EasyUnlockServiceFinchEnabledTest() {}
 
   // InProcessBrowserTest:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kForceFieldTrials,
                                     "EasyUnlock/Enable/");
   }
@@ -224,7 +224,7 @@ class EasyUnlockServiceFinchDisabledTest : public EasyUnlockServiceTest {
   virtual ~EasyUnlockServiceFinchDisabledTest() {}
 
   // InProcessBrowserTest:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kForceFieldTrials,
                                     "EasyUnlock/Disable/");
   }
@@ -256,7 +256,7 @@ class EasyUnlockServiceMultiProfileTest : public LoginManagerTest {
   virtual ~EasyUnlockServiceMultiProfileTest() {}
 
   // InProcessBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
 
     mock_adapter_ = new testing::NiceMock<MockBluetoothAdapter>();
@@ -275,8 +275,9 @@ IN_PROC_BROWSER_TEST_F(EasyUnlockServiceMultiProfileTest,
   StartupUtils::MarkOobeCompleted();
 }
 
+// Hangs flakily. See http://crbug.com/421448.
 IN_PROC_BROWSER_TEST_F(EasyUnlockServiceMultiProfileTest,
-                       DisallowedOnSecondaryProfile) {
+                       DISABLED_DisallowedOnSecondaryProfile) {
   LoginUser(kTestUser1);
   chromeos::UserAddingScreen::Get()->Start();
   base::RunLoop().RunUntilIdle();