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

Unified Diff: chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

Issue 14392017: Revert r196352 "dbus: Add FakeBus" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/chromeos.gyp ('k') | dbus/dbus.gyp » ('j') | 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 8b5f00a169df1bf6f9107f403b4354bfab4b32ea..68467355912a47fa9c7963b1decb503bb519b57e 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -18,7 +18,6 @@
#include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
#include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
#include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
-#include "dbus/fake_bus.h"
namespace chromeos {
@@ -60,8 +59,8 @@ void MockDBusThreadManagerWithoutGMock::RemoveObserver(
void MockDBusThreadManagerWithoutGMock::InitIBusBus(
const std::string& ibus_address,
const base::Closure& closure) {
- dbus::Bus::Options options;
- ibus_bus_ = new dbus::FakeBus(options);
+ // Non-null bus address is used to ensure the connection to ibus-daemon.
+ ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef);
}
dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {
« no previous file with comments | « chromeos/chromeos.gyp ('k') | dbus/dbus.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698