commit d40bab49e8cbb5970de11ead8b9f51642c11f253
author Eric Caruso <ejcaruso@chromium.org> Tue Aug 22 18:50:02 2017
committer chrome-bot <chrome-bot@chromium.org> Wed Aug 23 21:41:46 2017
tree e8e54acb474117c814f3799dbf0f62e07ac33359
parent 0f36410cec3fe0c95afa666f17198706c7669656

chromeos-dbus-bindings: remove ObjectManager from README

The object manager is unnecessary and Chrome OS daemons should
generally not be exporting multiple objects, so we don't want to
encourage it by making the primary example use one where it's
not needed.

BUG=None
TEST=None

Change-Id: Ibb985f0ffa3484433bd864c6b97744e5c2f8880e
Reviewed-on: https://chromium-review.googlesource.com/627097
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>

README.md

diff --git a/README.md b/README.md
index cc955eb..c8500e2 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,6 @@
 ```json
 {
   "service_name": "service.name.of.Frobinator",
-  "object_manager": {
-    "object_path": "/object/path/to/Frobinator/ObjectManager"
-  }
 }
 ```
 
@@ -70,8 +67,6 @@
 interface and adaptor classes for Frobinator, and users can
 `#include <frobinator/dbus-proxies.h>` to get the proxy classes. Try to
 follow the [best practices] doc and only export one object for your service.
-The `ObjectManager` here will be used to integrate with Brillo's D-Bus
-daemons but otherwise should not affect your implementation of the bindings.
 
 ## D-Bus types vs. C++ types
 
@@ -235,12 +230,9 @@
 class DBusAdaptor : public org::chromium::FrobinatorInterface,
                     public org::chromium::FrobinatorAdaptor {
  public:
-  explicit DBusAdaptor(
-      brillo::dbus_utils::ExportedObjectManager* object_manager)
+  explicit DBusAdaptor(scoped_refptr<dbus::Bus> bus)
     : org::chromium::FrobinatorAdaptor(this),
-      dbus_object_(object_manager,
-                   object_manager->GetBus(),
-                   dbus::ObjectPath(kFrobinatorServicePath)) {
+      dbus_object_(nullptr, bus, dbus::ObjectPath(kFrobinatorServicePath)) {}
 
   void RegisterAsync(
       const brillo::dbus_utils::AsyncEventSequencer::CompletionAction& cb) {
@@ -262,14 +254,12 @@
 
 class FrobinatorDaemon : public brillo::DBusServiceDaemon {
  public:
-  FrobinatorDaemon()
-    : DBusServiceDaemon(kFrobinatorServiceName,
-                        dbus::ObjectPath(kObjectManagerPath)) {}
+  FrobinatorDaemon() : DBusServiceDaemon(kFrobinatorServiceName) {}
 
  protected:
   void RegisterDBusObjectsAsync(
       brillo::dbus_utils::AsyncEventSequencer* sequencer) override {
-    adaptor_.reset(new DBusAdaptor(object_manager_.get()));
+    adaptor_.reset(new DBusAdaptor(bus_));
     adaptor_->RegisterAsync(sequencer->GetHandler("RegisterAsync() failed",
                                                   true));
   }