[aura] Fix LoginUserTest.UserPassed on Aura.

ScreenLocker is excluded from Aura build till it is fixed.

BUG=103489
TEST=LoginUserTest.UserPassed

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110901 0039d316-1c4b-4281-b951-d872f2087c98
parent b85d14c8
...@@ -51,8 +51,11 @@ class LoginUserTest : public LoginTestBase { ...@@ -51,8 +51,11 @@ class LoginUserTest : public LoginTestBase {
protected: protected:
virtual void SetUpInProcessBrowserTestFixture() { virtual void SetUpInProcessBrowserTestFixture() {
LoginTestBase::SetUpInProcessBrowserTestFixture(); LoginTestBase::SetUpInProcessBrowserTestFixture();
// TODO(nkostylev): Remove this once Aura build includes ScreenLocker.
#if !defined(USE_AURA)
EXPECT_CALL(*mock_screen_lock_library_, AddObserver(_)) EXPECT_CALL(*mock_screen_lock_library_, AddObserver(_))
.WillOnce(Return()); .WillOnce(Return());
#endif
} }
virtual void SetUpCommandLine(CommandLine* command_line) { virtual void SetUpCommandLine(CommandLine* command_line) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment