Remove calls to deprecated session_manager DBus methods

chrome/browser/chromeos/login/screen_locker_tester.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_tester.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 10 matching lines @@
 #include "content/public/test/test_utils.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/root_view.h"
 
 using content::WebContents;
 
 namespace {
 
+// This class is used to observe state of the global ScreenLocker instance,
+// which can go away as a result of a successful authentication. As such,
+// it needs to directly reference the global ScreenLocker.
 class LoginAttemptObserver : public chromeos::LoginStatusConsumer {
  public:
-  explicit LoginAttemptObserver(chromeos::ScreenLocker* locker);
+  LoginAttemptObserver();
   virtual ~LoginAttemptObserver();
 
   void WaitForAttempt();
 
   // Overridden from LoginStatusConsumer:
   virtual void OnLoginFailure(const chromeos::LoginFailure& error) OVERRIDE {
     LoginAttempted();
   }
 
   virtual void OnLoginSuccess(
       const chromeos::UserContext& credentials,
       bool pending_requests,
       bool using_oauth) OVERRIDE {
     LoginAttempted();
   }
 
  private:
   void LoginAttempted();
 
-  chromeos::ScreenLocker* locker_;
   bool login_attempted_;
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginAttemptObserver);
 };
 
-LoginAttemptObserver::LoginAttemptObserver(chromeos::ScreenLocker* locker)
+LoginAttemptObserver::LoginAttemptObserver()
     : chromeos::LoginStatusConsumer(),
-      locker_(locker),
       login_attempted_(false),
       waiting_(false) {
-  locker_->SetLoginStatusConsumer(this);
+  chromeos::ScreenLocker::default_screen_locker()->SetLoginStatusConsumer(this);
 }
 
 LoginAttemptObserver::~LoginAttemptObserver() {
-  locker_->SetLoginStatusConsumer(NULL);
+  chromeos::ScreenLocker* global_locker =
+      chromeos::ScreenLocker::default_screen_locker();
+  if (global_locker)
+    global_locker->SetLoginStatusConsumer(NULL);
 }
 
 void LoginAttemptObserver::WaitForAttempt() {
   if (!login_attempted_) {
     waiting_ = true;
     content::RunMessageLoop();
     waiting_ = false;
   }
   ASSERT_TRUE(login_attempted_);
 }
 
 void LoginAttemptObserver::LoginAttempted() {
   login_attempted_ = true;
   if (waiting_)
     base::MessageLoopForUI::current()->Quit();
 }
 
-}
+}  // anyonymous namespace
 
 namespace chromeos {
 
 namespace test {
 
 class WebUIScreenLockerTester : public ScreenLockerTester {
  public:
   // ScreenLockerTester overrides:
   virtual void SetPassword(const std::string& password) OVERRIDE;
   virtual std::string GetPassword() OVERRIDE;
@@ skipping 43 matching lines @@
   ASSERT_EQ(password, GetPassword());
 
   // Verify that "signin" button is hidden.
   scoped_ptr<base::Value> v = content::ExecuteScriptAndGetValue(
       RenderViewHost(),
       "$('pod-row').pods[0].signinButtonElement.hidden;");
   ASSERT_TRUE(v->GetAsBoolean(&result));
   ASSERT_TRUE(result);
 
   // Attempt to sign in.
-  LoginAttemptObserver login(ScreenLocker::screen_locker_);
+  LoginAttemptObserver login;
   v = content::ExecuteScriptAndGetValue(
       RenderViewHost(),
       "$('pod-row').pods[0].activate();");
   ASSERT_TRUE(v->GetAsBoolean(&result));
   ASSERT_TRUE(result);
 
   // Wait for login attempt.
   login.WaitForAttempt();
 }
 
@@ skipping 43 matching lines @@
       new MockAuthenticator(ScreenLocker::screen_locker_, user, password));
 }
 
 }  // namespace test
 
 test::ScreenLockerTester* ScreenLocker::GetTester() {
   return new test::WebUIScreenLockerTester();
 }
 
 }  // namespace chromeos