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

Unified Diff: chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

Issue 14428004: dbus: Add FakeShillManagerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment. 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 | « chromeos/dbus/mock_dbus_thread_manager_without_gmock.h ('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_without_gmock.cc
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 2d36b8f7ed1aca00fc4a7b6560ad5bc724a59508..f8297eb3d4593284d5c9cab20875f23d19ad935c 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -11,6 +11,7 @@
#include "chromeos/dbus/fake_bluetooth_input_client.h"
#include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
#include "chromeos/dbus/fake_cros_disks_client.h"
+#include "chromeos/dbus/fake_shill_manager_client.h"
#include "chromeos/dbus/ibus/mock_ibus_client.h"
#include "chromeos/dbus/ibus/mock_ibus_config_client.h"
#include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
@@ -28,6 +29,7 @@ MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock()
fake_bluetooth_profile_manager_client_(
new FakeBluetoothProfileManagerClient()),
fake_cros_disks_client_(new FakeCrosDisksClient),
+ fake_shill_manager_client_(new FakeShillManagerClient),
mock_ibus_client_(new MockIBusClient),
mock_ibus_input_context_client_(new MockIBusInputContextClient),
ibus_bus_(NULL) {
@@ -155,8 +157,7 @@ ShillIPConfigClient*
ShillManagerClient*
MockDBusThreadManagerWithoutGMock::GetShillManagerClient() {
- NOTIMPLEMENTED();
- return NULL;
+ return fake_shill_manager_client_.get();;
}
ShillProfileClient*
« no previous file with comments | « chromeos/dbus/mock_dbus_thread_manager_without_gmock.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698