commit b5dd5ea2c048416357987267e6d91080c6d1bfef
author Christopher Wiley <wiley@chromium.org> Mon Aug 11 10:51:20 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Aug 13 05:28:34 2014 +0000
tree baf3b5fa8f1638caecbbbf83417adc8d7b56b0ec
parent 5a9e718e5299c72094d1bcfd988d7e44831e9d07

buffet: libchromeos: Move ExportedObjectManager to libchromeos

We'd like to reuse this code in peerd.

BUG=chromium:398626
TEST=buffet/libchromeos unittests

Change-Id: I37be87dacbd5507d0f405b832cb45f65b4d70203
Reviewed-on: https://chromium-review.googlesource.com/211962
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
Tested-by: Christopher Wiley <wiley@chromium.org>

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index 1cb0da2..6f7928e 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -12,6 +12,7 @@
 #include <base/json/json_writer.h>
 #include <chromeos/async_event_sequencer.h>
 #include <chromeos/dbus_utils.h>
+#include <chromeos/exported_object_manager.h>
 #include <dbus/bus.h>
 #include <dbus/object_path.h>
 #include <dbus/values_util.h>
@@ -20,16 +21,16 @@
 #include "buffet/dbus_constants.h"
 #include "buffet/dbus_utils.h"
 #include "buffet/error.h"
-#include "buffet/exported_object_manager.h"
 
 using chromeos::dbus_utils::AsyncEventSequencer;
 using chromeos::dbus_utils::GetBadArgsError;
+using chromeos::dbus_utils::ExportedObjectManager;
 using buffet::dbus_utils::GetDBusError;
 
 namespace buffet {
 
 Manager::Manager(
-    const base::WeakPtr<dbus_utils::ExportedObjectManager>& object_manager)
+    const base::WeakPtr<ExportedObjectManager>& object_manager)
     : exported_object_(object_manager->GetBus()->GetExportedObject(
           dbus::ObjectPath(dbus_constants::kManagerServicePath))),
       object_manager_(object_manager) { }
@@ -121,7 +122,7 @@
   properties_->Init(
       sequencer->GetHandler("Manager properties export failed.", true));
   auto claim_interface_task = sequencer->WrapCompletionTask(
-      base::Bind(&dbus_utils::ExportedObjectManager::ClaimInterface,
+      base::Bind(&ExportedObjectManager::ClaimInterface,
                  object_manager_->AsWeakPtr(),
                  dbus::ObjectPath(dbus_constants::kManagerServicePath),
                  dbus_constants::kManagerInterface,