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

Unified Diff: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 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: 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 6f2ad55c95fd3b8c1c909babbe40c6630995951e..b194c5788ce592dd5c5d2c8893f3f0a628140bf4 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -198,6 +198,8 @@ MockDBusThreadManager::MockDBusThreadManager()
EXPECT_CALL(*mock_cryptohome_client_.get(), GetSystemSalt(_))
.WillRepeatedly(DoAll(SetArgumentPointee<0>(*GetMockSystemSalt()),
Return(true)));
+ EXPECT_CALL(*mock_cryptohome_client_.get(), TpmIsEnabled(_))
pneubeck (no reviews) 2013/05/13 09:17:06 unrelated change?
stevenjb 2013/05/13 23:49:35 Necessary to avoid Mock errors if we initialize Ne
+ .Times(AnyNumber());
// Called from BrightnessController::GetBrightnessPercent as part of ash tray
// initialization.

Powered by Google App Engine
This is Rietveld 408576698