Added more default expectations to MockDBusThreadManager.

chromeos/dbus/mock_dbus_thread_manager.cc

Index: chromeos/dbus/mock_dbus_thread_manager.cc
diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc
index fa19dd2c2bd162d832bf34d8779cf934e60ef673..627f6e74284b4b81a1ead81f8c908510e8b3e519 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -108,7 +108,11 @@ MockDBusThreadManager::MockDBusThreadManager()
       .WillRepeatedly(Return(mock_speech_synthesizer_client_.get()));
   EXPECT_CALL(*this, GetUpdateEngineClient())
       .WillRepeatedly(Return(mock_update_engine_client_.get()));
+  EXPECT_CALL(*this, GetIBusInputContextClient())
+      .WillRepeatedly(ReturnNull());
 
+  EXPECT_CALL(*this, GetSystemBus())
+      .WillRepeatedly(ReturnNull());
   EXPECT_CALL(*this, GetIBusBus())
       .WillRepeatedly(ReturnNull());
 
@@ -117,10 +121,16 @@ MockDBusThreadManager::MockDBusThreadManager()
       .Times(AnyNumber());
   EXPECT_CALL(*mock_power_manager_client_.get(), RemoveObserver(_))
       .Times(AnyNumber());
+  EXPECT_CALL(*mock_power_manager_client_.get(), NotifyUserActivity(_))
+      .Times(AnyNumber());
+  EXPECT_CALL(*mock_power_manager_client_.get(), NotifyVideoActivity(_, _))
+      .Times(AnyNumber());
   EXPECT_CALL(*mock_session_manager_client_.get(), AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_session_manager_client_.get(), RemoveObserver(_))
       .Times(AnyNumber());
+  EXPECT_CALL(*mock_session_manager_client_.get(), HasObserver(_))
+      .Times(AnyNumber());
   EXPECT_CALL(*mock_update_engine_client_.get(), AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_update_engine_client_.get(), RemoveObserver(_))
@@ -153,6 +163,9 @@ MockDBusThreadManager::MockDBusThreadManager()
   // Called from DiskMountManager::Initialize(), ChromeBrowserMainPartsChromeos.
   EXPECT_CALL(*mock_cros_disks_client_.get(), SetUpConnections(_, _))
       .Times(AnyNumber());
+  EXPECT_CALL(*mock_cros_disks_client_.get(),
+              EnumerateAutoMountableDevices(_, _))
+      .Times(AnyNumber());
 
   // Called from BluetoothManagerImpl ctor.
   EXPECT_CALL(*mock_bluetooth_manager_client_.get(), DefaultAdapter(_))
@@ -168,6 +181,15 @@ MockDBusThreadManager::MockDBusThreadManager()
   // initialization.
   EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_))
       .Times(AnyNumber());
+
+  // Called from GeolocationHandler::Init().
+  EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))
+      .Times(AnyNumber());
+  EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_))
+      .Times(AnyNumber());
+  EXPECT_CALL(*mock_shill_manager_client_.get(),
+              RemovePropertyChangedObserver(_))
+      .Times(AnyNumber());
 }
 
 MockDBusThreadManager::~MockDBusThreadManager() {