chromeos: Fix LoginUserTest.UserPassed and LoginProfileTest.UserNotPassed.

Fix mock expectations.

TEST=out/Release/browser_tests --gtest_filter=LoginProfileTest.UserNotPassed;
out/Release/browser_tests --gtest_filter=LoginUserTest.UserPassed
BUG=chromium-os:2335

Review URL: http://codereview.chromium.org/8639008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111183 0039d316-1c4b-4281-b951-d872f2087c98

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");