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

Unified Diff: chrome/browser/chromeos/settings/signed_settings_unittest.cc

Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the build for sure Created 8 years, 4 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
Index: chrome/browser/chromeos/settings/signed_settings_unittest.cc
diff --git a/chrome/browser/chromeos/settings/signed_settings_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_unittest.cc
index 0765f91c22802a0c7c81f55dede6a0edde563300..2ffa0c8b5bceef8eea1e28a8f3ee5ed037bbe5ac 100644
--- a/chrome/browser/chromeos/settings/signed_settings_unittest.cc
+++ b/chrome/browser/chromeos/settings/signed_settings_unittest.cc
@@ -118,6 +118,8 @@ class SignedSettingsTest : public testing::Test {
virtual void SetUp() {
file_thread_.Start();
+ EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus())
+ .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
}
« no previous file with comments | « chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc ('k') | chromeos/display/output_configurator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698