Remove calls to deprecated session_manager DBus methods

RestartEntd() was deprecated years ago, so calls to this method
can certainly be removed. The UnlockScreen() method has done
nothing but emit a signal that no process listens to for several
releases now.

BUG=chromium:286401
TEST=unit tests, desktopui_ScreenLocker autotest

Review URL: https://chromiumcodereview.appspot.com/23694025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222227 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/enterprise_extension_observer.cc

@@ -61,10 +61,8 @@ void EnterpriseExtensionObserver::CheckExtensionAndNotifyEntd(
   }
 }
 
-// static
 void EnterpriseExtensionObserver::NotifyEntd() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DBusThreadManager::Get()->GetSessionManagerClient()->RestartEntd();
+  NOTREACHED();
 }
 
 }  // namespace chromeos

chrome/browser/chromeos/login/screen_locker.cc

@@ -118,11 +118,6 @@ class ScreenLockObserver : public chromeos::SessionManagerClient::Observer,
     }
   }
 
-  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();
@@ -259,9 +254,6 @@ void ScreenLocker::UnlockOnLoginSuccess() {
     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,
@@ -272,6 +264,9 @@ void ScreenLocker::UnlockOnLoginSuccess() {
   }
   authentication_capture_.reset();
   weak_factory_.InvalidateWeakPtrs();
+
+  VLOG(1) << "Hiding the lock screen.";
+  chromeos::ScreenLocker::Hide();
 }
 
 void ScreenLocker::Authenticate(const UserContext& user_context) {
@@ -381,10 +376,9 @@ 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
@@ -457,4 +451,3 @@ bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
 }
 
 }  // namespace chromeos
-

chrome/browser/chromeos/login/screen_locker_browsertest.cc

@@ -159,17 +159,13 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBasic) {
   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());
 }
 
@@ -197,8 +193,6 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
   tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
   tester->EnterPassword("pass");
   content::RunAllPendingInMessageLoop();
-  ScreenLocker::Hide();
-  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }

chrome/browser/chromeos/login/screen_locker_tester.cc

@@ -28,9 +28,12 @@ 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();
@@ -50,23 +53,24 @@ class LoginAttemptObserver : public chromeos::LoginStatusConsumer {
  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() {
@@ -84,7 +88,7 @@ void LoginAttemptObserver::LoginAttempted() {
     base::MessageLoopForUI::current()->Quit();
 }
 
-}
+}  // anyonymous namespace
 
 namespace chromeos {
 
@@ -148,7 +152,7 @@ void WebUIScreenLockerTester::EnterPassword(const std::string& password) {
   ASSERT_TRUE(result);
 
   // Attempt to sign in.
-  LoginAttemptObserver login(ScreenLocker::screen_locker_);
+  LoginAttemptObserver login;
   v = content::ExecuteScriptAndGetValue(
       RenderViewHost(),
       "$('pod-row').pods[0].activate();");

chrome/browser/chromeos/power/screen_lock_observer.cc

@@ -17,7 +17,7 @@ ScreenLockObserver::~ScreenLockObserver() {
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
 }
 
-void ScreenLockObserver::UnlockScreen() {
+void ScreenLockObserver::ScreenIsUnlocked() {
   extensions::DispatchScreenUnlockedEvent();
 }
 

chrome/browser/chromeos/power/screen_lock_observer.h

@@ -20,7 +20,7 @@ class ScreenLockObserver : public SessionManagerClient::Observer {
   virtual ~ScreenLockObserver();
 
   // SessionManagerClient::Observer override.
-  virtual void UnlockScreen() OVERRIDE;
+  virtual void ScreenIsUnlocked() OVERRIDE;
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver);
 };

chrome/browser/chromeos/settings/device_settings_test_helper.cc

@@ -113,8 +113,6 @@ void DeviceSettingsTestHelper::EmitLoginPromptVisible() {}
 void DeviceSettingsTestHelper::RestartJob(int pid,
                                           const std::string& command_line) {}
 
-void DeviceSettingsTestHelper::RestartEntd() {}
-
 void DeviceSettingsTestHelper::StartSession(const std::string& user_email) {}
 
 void DeviceSettingsTestHelper::StopSession() {}
@@ -125,8 +123,6 @@ void DeviceSettingsTestHelper::RequestLockScreen() {}
 
 void DeviceSettingsTestHelper::NotifyLockScreenShown() {}
 
-void DeviceSettingsTestHelper::RequestUnlockScreen() {}
-
 void DeviceSettingsTestHelper::NotifyLockScreenDismissed() {}
 
 void DeviceSettingsTestHelper::RetrieveActiveSessions(

chrome/browser/chromeos/settings/device_settings_test_helper.h

@@ -85,13 +85,11 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
   virtual void EmitLoginPromptReady() OVERRIDE;
   virtual void EmitLoginPromptVisible() OVERRIDE;
   virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE;
-  virtual void RestartEntd() OVERRIDE;
   virtual void StartSession(const std::string& user_email) OVERRIDE;
   virtual void StopSession() OVERRIDE;
   virtual void StartDeviceWipe() OVERRIDE;
   virtual void RequestLockScreen() OVERRIDE;
   virtual void NotifyLockScreenShown() OVERRIDE;
-  virtual void RequestUnlockScreen() OVERRIDE;
   virtual void NotifyLockScreenDismissed() OVERRIDE;
   virtual void RetrieveActiveSessions(
       const ActiveSessionsCallback& callback) OVERRIDE;

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -1091,7 +1091,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
         GetUserLoginStatus());
   }
 
-  virtual void UnlockScreen() OVERRIDE {
+  virtual void ScreenIsUnlocked() OVERRIDE {
     screen_locked_ = false;
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         GetUserLoginStatus());

chromeos/dbus/fake_session_manager_client.cc

@@ -48,9 +48,6 @@ void FakeSessionManagerClient::RestartJob(int pid,
                                           const std::string& command_line) {
 }
 
-void FakeSessionManagerClient::RestartEntd() {
-}
-
 void FakeSessionManagerClient::StartSession(const std::string& user_email) {
   DCHECK_EQ(0UL, user_sessions_.count(user_email));
   std::string user_id_hash =
@@ -72,9 +69,6 @@ void FakeSessionManagerClient::NotifyLockScreenShown() {
   notify_lock_screen_shown_call_count_++;
 }
 
-void FakeSessionManagerClient::RequestUnlockScreen() {
-}
-
 void FakeSessionManagerClient::NotifyLockScreenDismissed() {
   notify_lock_screen_dismissed_call_count_++;
 }

chromeos/dbus/fake_session_manager_client.h

@@ -30,13 +30,11 @@ class FakeSessionManagerClient : public SessionManagerClient {
   virtual void EmitLoginPromptReady() OVERRIDE;
   virtual void EmitLoginPromptVisible() OVERRIDE;
   virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE;
-  virtual void RestartEntd() OVERRIDE;
   virtual void StartSession(const std::string& user_email) OVERRIDE;
   virtual void StopSession() OVERRIDE;
   virtual void StartDeviceWipe() OVERRIDE;
   virtual void RequestLockScreen() OVERRIDE;
   virtual void NotifyLockScreenShown() OVERRIDE;
-  virtual void RequestUnlockScreen() OVERRIDE;
   virtual void NotifyLockScreenDismissed() OVERRIDE;
   virtual void RetrieveActiveSessions(
       const ActiveSessionsCallback& callback) OVERRIDE;

chromeos/dbus/mock_session_manager_client.h

@@ -23,14 +23,12 @@ class MockSessionManagerClient : public SessionManagerClient {
   MOCK_METHOD1(HasObserver, bool(Observer*));
   MOCK_METHOD0(EmitLoginPromptReady, void(void));
   MOCK_METHOD0(EmitLoginPromptVisible, void(void));
-  MOCK_METHOD0(RestartEntd, void(void));
   MOCK_METHOD2(RestartJob, void(int, const std::string&));
   MOCK_METHOD1(StartSession, void(const std::string&));
   MOCK_METHOD0(StopSession, void(void));
   MOCK_METHOD0(StartDeviceWipe, void(void));
   MOCK_METHOD0(RequestLockScreen, void(void));
   MOCK_METHOD0(NotifyLockScreenShown, void(void));
-  MOCK_METHOD0(RequestUnlockScreen, void(void));
   MOCK_METHOD0(NotifyLockScreenDismissed, void(void));
   MOCK_METHOD1(RetrieveActiveSessions, void(const ActiveSessionsCallback&));
   MOCK_METHOD1(RetrieveDevicePolicy, void(const RetrievePolicyCallback&));

chromeos/dbus/session_manager_client.cc

@@ -71,10 +71,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual void RestartEntd() OVERRIDE {
-    SimpleMethodCallToSessionManager(login_manager::kSessionManagerRestartEntd);
-  }
-
   virtual void StartSession(const std::string& user_email) OVERRIDE {
     dbus::MethodCall method_call(login_manager::kSessionManagerInterface,
                                  login_manager::kSessionManagerStartSession);
@@ -119,11 +115,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
         login_manager::kSessionManagerHandleLockScreenShown);
   }
 
-  virtual void RequestUnlockScreen() OVERRIDE {
-    SimpleMethodCallToSessionManager(
-        login_manager::kSessionManagerUnlockScreen);
-  }
-
   virtual void NotifyLockScreenDismissed() OVERRIDE {
     SimpleMethodCallToSessionManager(
         login_manager::kSessionManagerHandleLockScreenDismissed);
@@ -274,13 +265,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&SessionManagerClientImpl::SignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
-    session_manager_proxy_->ConnectToSignal(
-        chromium::kChromiumInterface,
-        chromium::kUnlockScreenSignal,
-        base::Bind(&SessionManagerClientImpl::ScreenUnlockReceived,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&SessionManagerClientImpl::SignalConnected,
-                   weak_ptr_factory_.GetWeakPtr()));
     session_manager_proxy_->ConnectToSignal(
         chromium::kChromiumInterface,
         chromium::kLivenessRequestedSignal,
@@ -494,10 +478,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
     FOR_EACH_OBSERVER(Observer, observers_, LockScreen());
   }
 
-  void ScreenUnlockReceived(dbus::Signal* signal) {
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
-  }
-
   void LivenessRequestedReceived(dbus::Signal* signal) {
     SimpleMethodCallToSessionManager(
         login_manager::kSessionManagerHandleLivenessConfirmed);
@@ -562,7 +542,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
   virtual void EmitLoginPromptReady() OVERRIDE {}
   virtual void EmitLoginPromptVisible() OVERRIDE {}
   virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE {}
-  virtual void RestartEntd() OVERRIDE {}
   virtual void StartSession(const std::string& user_email) OVERRIDE {}
   virtual void StopSession() OVERRIDE {}
   virtual void StartDeviceWipe() OVERRIDE {}
@@ -572,9 +551,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
   virtual void NotifyLockScreenShown() OVERRIDE {
     FOR_EACH_OBSERVER(Observer, observers_, ScreenIsLocked());
   }
-  virtual void RequestUnlockScreen() OVERRIDE {
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
-  }
   virtual void NotifyLockScreenDismissed() OVERRIDE {
     FOR_EACH_OBSERVER(Observer, observers_, ScreenIsUnlocked());
   }

chromeos/dbus/session_manager_client.h

@@ -34,10 +34,6 @@ class CHROMEOS_EXPORT SessionManagerClient : public DBusClient {
     // session manager).
     virtual void LockScreen() {}
 
-    // Called when the session manager requests that the lock screen be
-    // dismissed.  NotifyLockScreenDismissed() is called afterward.
-    virtual void UnlockScreen() {}
-
     // Called when the session manager announces that the screen has been locked
     // successfully (i.e. after NotifyLockScreenShown() has been called).
     virtual void ScreenIsLocked() {}
@@ -62,10 +58,6 @@ class CHROMEOS_EXPORT SessionManagerClient : public DBusClient {
   // Restarts a job referenced by |pid| with the provided command line.
   virtual void RestartJob(int pid, const std::string& command_line) = 0;
 
-  // Restarts entd (the enterprise daemon).
-  // DEPRECATED: will be deleted soon.
-  virtual void RestartEntd() = 0;
-
   // Starts the session for the user.
   virtual void StartSession(const std::string& user_email) = 0;
 
@@ -81,9 +73,6 @@ class CHROMEOS_EXPORT SessionManagerClient : public DBusClient {
   // Notifies that the lock screen is shown.
   virtual void NotifyLockScreenShown() = 0;
 
-  // Unlocks the screen.
-  virtual void RequestUnlockScreen() = 0;
-
   // Notifies that the lock screen is dismissed.
   virtual void NotifyLockScreenDismissed() = 0;