Remove calls to deprecated session_manager DBus methods

chrome/browser/chromeos/login/screen_locker.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 <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 100 matching lines @@
       // completed all sign-in steps yet, log out instead. The latter is done to
       // avoid complications with displaying the lock screen over the login
       // screen while remaining secure in the case the user walks away during
       // the sign-in steps. See crbug.com/112225 and crbug.com/110933.
       VLOG(1) << "Calling session manager's StopSession D-Bus method";
       chromeos::DBusThreadManager::Get()->
           GetSessionManagerClient()->StopSession();
     }
   }
 
-  virtual void UnlockScreen() OVERRIDE {
-    VLOG(1) << "Received UnlockScreen D-Bus signal from session manager";
-    chromeos::ScreenLocker::Hide();
-  }
-
   virtual void OnUserAddingFinished() OVERRIDE {
     chromeos::UserAddingScreen::Get()->RemoveObserver(this);
     LockScreen();
   }
 
  private:
   bool session_started_;
   content::NotificationRegistrar registrar_;
   std::string saved_previous_input_method_id_;
   std::string saved_current_input_method_id_;
@@ skipping 116 matching lines @@
 }
 
 void ScreenLocker::UnlockOnLoginSuccess() {
   DCHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
   if (!authentication_capture_.get()) {
     LOG(WARNING) << "Call to UnlockOnLoginSuccess without previous " <<
       "authentication success.";
     return;
   }
 
-  VLOG(1) << "Calling session manager's UnlockScreen D-Bus method";
-  DBusThreadManager::Get()->GetSessionManagerClient()->RequestUnlockScreen();
-
   if (login_status_consumer_) {
     login_status_consumer_->OnLoginSuccess(
         UserContext(authentication_capture_->username,
                     std::string(),   // password
                     std::string()),  // auth_code
         authentication_capture_->pending_requests,
         authentication_capture_->using_oauth);
   }
   authentication_capture_.reset();
   weak_factory_.InvalidateWeakPtrs();
+
+  VLOG(1) << "Hiding the lock screen.";
+  chromeos::ScreenLocker::Hide();
 }
 
 void ScreenLocker::Authenticate(const UserContext& user_context) {
   LOG_ASSERT(IsUserLoggedIn(user_context.username))
       << "Invalid user trying to unlock.";
   authentication_start_time_ = base::Time::Now();
   delegate_->SetInputEnabled(false);
   delegate_->OnAuthenticate();
 
   BrowserThread::PostTask(
@@ skipping 89 matching lines @@
   base::Callback<void(void)> callback =
       base::Bind(&ScreenLocker::ScheduleDeletion);
   ash::Shell::GetInstance()->lock_state_controller()->
     OnLockScreenHide(callback);
 }
 
 void ScreenLocker::ScheduleDeletion() {
   // Avoid possible multiple calls.
   if (screen_locker_ == NULL)
     return;
-  VLOG(1) << "Posting task to delete ScreenLocker " << screen_locker_;
-  ScreenLocker* screen_locker = screen_locker_;
+  VLOG(1) << "Deleting ScreenLocker " << screen_locker_;
+  delete screen_locker_;
   screen_locker_ = NULL;
-  base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, screen_locker);
 }
 
 // static
 void ScreenLocker::InitClass() {
   g_screen_lock_observer.Get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ScreenLocker, private:
 
@@ skipping 52 matching lines @@
 
 bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
   for (UserList::const_iterator it = users_.begin(); it != users_.end(); ++it) {
     if ((*it)->email() == username)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos
-