Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Unified Diff: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cc4d9f8aede383fd57c33efc19aeda12fd15e269..d6d9402fe08a32d56604857bdbcfd1a2a5bfd791 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -32,6 +32,7 @@
using ::testing::AnyNumber;
using ::testing::Return;
+using ::testing::ReturnNull;
using ::testing::_;
namespace chromeos {
@@ -113,6 +114,9 @@ MockDBusThreadManager::MockDBusThreadManager()
EXPECT_CALL(*this, GetUpdateEngineClient())
.WillRepeatedly(Return(mock_update_engine_client_.get()));
+ EXPECT_CALL(*this, GetIBusBus())
+ .WillRepeatedly(ReturnNull());
+
// These observers calls are used in ChromeBrowserMainPartsChromeos.
EXPECT_CALL(*mock_power_manager_client_.get(), AddObserver(_))
.Times(AnyNumber());
@@ -126,6 +130,26 @@ MockDBusThreadManager::MockDBusThreadManager()
.Times(AnyNumber());
EXPECT_CALL(*mock_update_engine_client_.get(), RemoveObserver(_))
.Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_manager_client_.get(), AddObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_manager_client_.get(), RemoveObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_adapter_client_.get(), AddObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_adapter_client_.get(), RemoveObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_device_client_.get(), AddObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_device_client_.get(), RemoveObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_input_client_.get(), AddObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_input_client_.get(), RemoveObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_node_client_.get(), AddObserver(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_bluetooth_node_client_.get(), RemoveObserver(_))
+ .Times(AnyNumber());
// Called from PowerMenuButton ctor.
EXPECT_CALL(*mock_power_manager_client_.get(), RequestStatusUpdate(_))
@@ -134,6 +158,21 @@ MockDBusThreadManager::MockDBusThreadManager()
// Called from DiskMountManager::Initialize(), ChromeBrowserMainPartsChromeos.
EXPECT_CALL(*mock_cros_disks_client_.get(), SetUpConnections(_, _))
.Times(AnyNumber());
+
+ // Called from BluetoothManagerImpl ctor.
+ EXPECT_CALL(*mock_bluetooth_manager_client_.get(), DefaultAdapter(_))
+ .Times(AnyNumber());
+
+ // Called from AsyncMethodCaller ctor and dtor.
+ EXPECT_CALL(*mock_cryptohome_client_.get(), SetAsyncCallStatusHandler(_))
+ .Times(AnyNumber());
+ EXPECT_CALL(*mock_cryptohome_client_.get(), ResetAsyncCallStatusHandler())
+ .Times(AnyNumber());
+
+ // Called from BrightnessController::GetBrightnessPercent as part of ash tray
+ // initialization.
+ EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_))
+ .Times(AnyNumber());
}
MockDBusThreadManager::~MockDBusThreadManager() {}
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698