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

Unified Diff: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 14092002: Move MockUpdateEngineClient::GetLastStatus() expectation to MockDBusThreadManager's ctor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed typo in commit msg Created 7 years, 8 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/browser/policy/cloud/component_cloud_policy_browsertest.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 99e1a35f4e994098aa57563f726edc7a77deab1b..10f3d86b21d7b5bf53a3e3a40b89bacb6815f406 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -273,6 +273,13 @@ MockDBusThreadManager::MockDBusThreadManager()
EXPECT_CALL(*mock_shill_manager_client_.get(),
RemovePropertyChangedObserver(_))
.Times(AnyNumber());
+
+ // For CrOS browsertests, ChromeBrowserMainPartsChromeos::PostProfileInit()
+ // creates an AutomaticRebootManager which calls the following function.
+ // For unittests, this function won't get called.
+ EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
+ .Times(AnyNumber())
Daniel Erat 2013/04/10 20:06:00 nit: is this .Times(AnyNumber()) necessary? i thi
Yufeng Shen (Slow to review) 2013/04/10 20:29:21 Done.
+ .WillRepeatedly(Return(MockUpdateEngineClient::Status()));
}
MockDBusThreadManager::~MockDBusThreadManager() {
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698