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

Unified Diff: chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc

Issue 8386031: Move chromeos_mount.cc from libcros to Chrome tree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up format Created 9 years, 1 month 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/dbus/mock_dbus_thread_manager.cc
diff --git a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc b/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc
index 53f8384f6fa8a2e0f318d6515a78bccf5e437a49..f3fa32582211aa061efdc89bd116ccc059acd399 100644
--- a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/chromeos/dbus/mock_sensors_client.h"
#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
#include "chrome/browser/chromeos/dbus/mock_speech_synthesizer_client.h"
+#include "chrome/browser/chromeos/dbus/mock_cros_disks_client.h"
using ::testing::Return;
@@ -21,7 +22,8 @@ MockDBusThreadManager::MockDBusThreadManager()
mock_power_manager_client_(new MockPowerManagerClient),
mock_sensors_client_(new MockSensorsClient),
mock_session_manager_client_(new MockSessionManagerClient),
- mock_speech_synthesizer_client_(new MockSpeechSynthesizerClient) {
+ mock_speech_synthesizer_client_(new MockSpeechSynthesizerClient),
+ mock_cros_disks_client_(new MockCrosDisksClient) {
EXPECT_CALL(*this, GetBluetoothAdapterClient())
.WillRepeatedly(Return(mock_bluetooth_adapter_client_.get()));
EXPECT_CALL(*this, GetBluetoothManagerClient())
@@ -34,6 +36,8 @@ MockDBusThreadManager::MockDBusThreadManager()
.WillRepeatedly(Return(mock_session_manager_client_.get()));
EXPECT_CALL(*this, GetSpeechSynthesizerClient())
.WillRepeatedly(Return(mock_speech_synthesizer_client_.get()));
+ EXPECT_CALL(*this, GetCrosDisksClient())
+ .WillRepeatedly(Return(mock_cros_disks_client_.get()));
}
MockDBusThreadManager::~MockDBusThreadManager() {}

Powered by Google App Engine
This is Rietveld 408576698