Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: chrome/browser/chromeos/login/login_browsertest.cc

Issue 8639008: chromeos: Fix LoginUserTest.UserPassed and LoginProfileTest.UserNotPassed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698