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

5 files changed, 0 insertions, 45 deletions

diff --git a/chromeos/dbus/fake_session_manager_client.cc b/chromeos/dbus/fake_session_manager_client.cc
index a93f237..482d3a5 100644
--- a/chromeos/dbus/fake_session_manager_client.cc
+++ b/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_++;
 }
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h
index 805b261..a993d1f 100644
--- a/chromeos/dbus/fake_session_manager_client.h
+++ b/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;
diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h
index 14e879b..a75a4e9 100644
--- a/chromeos/dbus/mock_session_manager_client.h
+++ b/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&));
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index f75a9d4..b49fca3 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/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);
@@ -276,13 +267,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
                    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,
         base::Bind(&SessionManagerClientImpl::LivenessRequestedReceived,
                    weak_ptr_factory_.GetWeakPtr()),
@@ -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());
   }
diff --git a/chromeos/dbus/session_manager_client.h b/chromeos/dbus/session_manager_client.h
index f09a041..4d1dc14 100644
--- a/chromeos/dbus/session_manager_client.h
+++ b/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;