Use MockDBusThreadManagerWithoutGMock for ScreenLockerTest

Add call_count for FakeSessionManagerClient
and checkes them in ScreenLockerTest
to replace call expectations.

BUG=239333,234457
TEST=trybots

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

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

2 files changed, 17 insertions, 1 deletions

diff --git a/chromeos/dbus/fake_session_manager_client.cc b/chromeos/dbus/fake_session_manager_client.cc
index 3810798..177cc11 100644
--- a/chromeos/dbus/fake_session_manager_client.cc
+++ b/chromeos/dbus/fake_session_manager_client.cc
@@ -12,7 +12,9 @@
 namespace chromeos {
 
 FakeSessionManagerClient::FakeSessionManagerClient()
-  : emit_login_prompt_ready_call_count_(0) {
+  : emit_login_prompt_ready_call_count_(0) ,
+    notify_lock_screen_shown_call_count_(0),
+    notify_lock_screen_dismissed_call_count_(0){
 }
 
 FakeSessionManagerClient::~FakeSessionManagerClient() {
@@ -57,12 +59,14 @@ void FakeSessionManagerClient::RequestLockScreen() {
 }
 
 void FakeSessionManagerClient::NotifyLockScreenShown() {
+  notify_lock_screen_shown_call_count_++;
 }
 
 void FakeSessionManagerClient::RequestUnlockScreen() {
 }
 
 void FakeSessionManagerClient::NotifyLockScreenDismissed() {
+  notify_lock_screen_dismissed_call_count_++;
 }
 
 void FakeSessionManagerClient::RetrieveDevicePolicy(
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h
index bd7c7e5..741f68c 100644
--- a/chromeos/dbus/fake_session_manager_client.h
+++ b/chromeos/dbus/fake_session_manager_client.h
@@ -72,6 +72,16 @@ class FakeSessionManagerClient : public chromeos::SessionManagerClient {
     return emit_login_prompt_ready_call_count_;
   }
 
+  // Returns how many times LockScreenShown() was called.
+  int notify_lock_screen_shown_call_count() {
+    return notify_lock_screen_shown_call_count_;
+  }
+
+  // Returns how many times LockScreenDismissed() was called.
+  int notify_lock_screen_dismissed_call_count() {
+    return notify_lock_screen_dismissed_call_count_;
+  }
+
  private:
   std::string device_policy_;
   std::string user_policy_;
@@ -79,6 +89,8 @@ class FakeSessionManagerClient : public chromeos::SessionManagerClient {
   ObserverList<Observer> observers_;
 
   int emit_login_prompt_ready_call_count_;
+  int notify_lock_screen_shown_call_count_;
+  int notify_lock_screen_dismissed_call_count_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSessionManagerClient);
 };