[aura] Fix LoginUserTest.UserPassed on Aura.

chrome/browser/chromeos/login/login_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
@@ skipping 33 matching lines @@
   MockScreenLockLibrary* mock_screen_lock_library_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
 };
 
 class LoginUserTest : public LoginTestBase {
  protected:
   virtual void SetUpInProcessBrowserTestFixture() {
     LoginTestBase::SetUpInProcessBrowserTestFixture();
+    // TODO(nkostylev): Remove this once Aura build includes ScreenLocker.
+#if !defined(USE_AURA)
     EXPECT_CALL(*mock_screen_lock_library_, AddObserver(_))
         .WillOnce(Return());
+#endif
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitchASCII(switches::kLoginUser, "TestUser@gmail.com");
     command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
     command_line->AppendSwitch(switches::kNoFirstRun);
   }
 };
 
 class LoginProfileTest : public LoginTestBase {
@@ skipping 16 matching lines @@
 // On initial launch, we should get the OTR default profile.
 IN_PROC_BROWSER_TEST_F(LoginProfileTest, UserNotPassed) {
   Profile* profile = browser()->profile();
   EXPECT_EQ("Default", profile->GetPath().BaseName().value());
   EXPECT_TRUE(profile->IsOffTheRecord());
   // Ensure there's extension service for this profile.
   EXPECT_TRUE(profile->GetExtensionService());
 }
 
 } // namespace chromeos