| Index: chrome/browser/chromeos/login/login_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
|
| index 0f87183c38e478f7144ef55559aabc714dda047a..0bedd95c5466b3df54c634d4e7bd9ea177d30e46 100644
|
| --- a/chrome/browser/chromeos/login/login_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_browsertest.cc
|
| @@ -20,6 +20,7 @@
|
|
|
| namespace chromeos {
|
| using ::testing::_;
|
| +using ::testing::AtLeast;
|
| using ::testing::Return;
|
|
|
| class LoginTestBase : public CrosInProcessBrowserTest {
|
| @@ -54,7 +55,11 @@ class LoginUserTest : public LoginTestBase {
|
| // TODO(nkostylev): Remove this once Aura build includes ScreenLocker.
|
| #if !defined(USE_AURA)
|
| EXPECT_CALL(*mock_screen_lock_library_, AddObserver(_))
|
| - .WillOnce(Return());
|
| + .Times(AtLeast(1))
|
| + .WillRepeatedly(Return());
|
| + EXPECT_CALL(*mock_screen_lock_library_, RemoveObserver(_))
|
| + .Times(AtLeast(1))
|
| + .WillRepeatedly(Return());
|
| #endif
|
| }
|
|
|
| @@ -65,7 +70,7 @@ class LoginUserTest : public LoginTestBase {
|
| }
|
| };
|
|
|
| -class LoginProfileTest : public LoginTestBase {
|
| +class LoginProfileTest : public LoginUserTest {
|
| protected:
|
| virtual void SetUpCommandLine(CommandLine* command_line) {
|
| command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
|
|
|