dbus: Add FakeBus

BUG=234078
TEST=trybots

Review URL: https://chromiumcodereview.appspot.com/14493004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196352 0039d316-1c4b-4281-b951-d872f2087c98

chromeos/chromeos.gyp

@@ -378,6 +378,7 @@
       'type': 'static_library',
       'dependencies': [
         '../build/linux/system.gyp:dbus',
+        '../dbus/dbus.gyp:dbus_test_support',
         'chromeos',
         'power_manager_proto',
       ],

chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

@@ -17,6 +17,7 @@
 #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 {
 
@@ -53,8 +54,8 @@ void MockDBusThreadManagerWithoutGMock::RemoveObserver(
 void MockDBusThreadManagerWithoutGMock::InitIBusBus(
     const std::string& ibus_address,
     const base::Closure& closure) {
-  // Non-null bus address is used to ensure the connection to ibus-daemon.
-  ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef);
+  dbus::Bus::Options options;
+  ibus_bus_ = new dbus::FakeBus(options);
 }
 
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {

dbus/dbus.gyp

@@ -59,8 +59,8 @@
       'includes': [ '../build/protoc.gypi' ],
     },
     {
-      # This target contains mocks that can be used to write unit tests
-      # without issuing actual D-Bus calls.
+      # This target contains mocks and fakes that can be used to write unit
+      # tests without issuing actual D-Bus calls.
       'target_name': 'dbus_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -69,6 +69,8 @@
         'dbus',
       ],
       'sources': [
+        'fake_bus.cc',
+        'fake_bus.h',
         'mock_bus.cc',
         'mock_bus.h',
         'mock_exported_object.cc',

dbus/fake_bus.cc

@@ -0,0 +1,17 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "dbus/fake_bus.h"
+
+#include "base/location.h"
+
+namespace dbus {
+
+FakeBus::FakeBus(const Bus::Options& options) : Bus(options) {
+}
+
+FakeBus::~FakeBus() {
+}
+
+}  // namespace dbus

dbus/fake_bus.h

@@ -0,0 +1,23 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DBUS_FAKE_BUS_H_
+#define DBUS_FAKE_BUS_H_
+
+#include "dbus/bus.h"
+
+namespace dbus {
+
+// A fake implementation of Bus, which does nothing.
+class FakeBus : public Bus {
+ public:
+  FakeBus(const Bus::Options& options);
+
+ protected:
+  virtual ~FakeBus();
+};
+
+}  // namespace dbus
+
+#endif  // DBUS_FAKE_BUS_H_