Remove calls to deprecated session_manager DBus methods

chrome/browser/chromeos/login/screen_locker_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/screen_locker.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 141 matching lines @@
   EXPECT_GT(lock_bounds.width(), 10);
   EXPECT_GT(lock_bounds.height(), 10);
 
   tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
   EXPECT_TRUE(tester->IsLocked());
   tester->EnterPassword("fail");
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(tester->IsLocked());
   tester->EnterPassword("pass");
   content::RunAllPendingInMessageLoop();
-  // Successful authentication simply send a unlock request to PowerManager.
-  EXPECT_TRUE(tester->IsLocked());
+  // Successful authentication clears the lock screen and tells the
+  // SessionManager to announce this over DBus.
+  EXPECT_FALSE(tester->IsLocked());
   EXPECT_EQ(
       1,
       fake_session_manager_client_->notify_lock_screen_shown_call_count());
 
-  // Emulate LockScreen request from SessionManager.
-  // TODO(oshima): Find out better way to handle this in mock.
-  ScreenLocker::Hide();
-  content::RunAllPendingInMessageLoop();
-  EXPECT_FALSE(tester->IsLocked());
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   {
     Waiter waiter(browser());
     browser()->fullscreen_controller()->ToggleFullscreenMode();
     waiter.Wait(false /* not locked */, true /* full screen */);
     EXPECT_TRUE(browser()->window()->IsFullscreen());
     EXPECT_FALSE(tester->IsLocked());
   }
   {
     Waiter waiter(browser());
     ScreenLocker::Show();
     tester->EmulateWindowManagerReady();
     waiter.Wait(true /* locked */, false /* full screen */);
     EXPECT_FALSE(browser()->window()->IsFullscreen());
     EXPECT_TRUE(tester->IsLocked());
   }
   EXPECT_EQ(
       1,
       fake_session_manager_client_->notify_lock_screen_shown_call_count());
 
   tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
   tester->EnterPassword("pass");
   content::RunAllPendingInMessageLoop();
-  ScreenLocker::Hide();
-  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }
 
 void SimulateKeyPress(views::Widget* widget, ui::KeyboardCode key_code) {
   ui_controls::SendKeyPress(widget->GetNativeWindow(),
                             key_code, false, false, false, false);
 }
 
 void UnlockKeyPress(views::Widget* widget) {
@@ skipping 43 matching lines @@
   EXPECT_EQ("", tester->GetPassword());
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }
 
 }  // namespace chromeos