commit 1aa980ea5f5325cb5f5fc43c1748fbb393c6ec51
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 d05d4ac8af64d8d1f69fc2816dc0cf5d74d96100

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.h

diff --git a/buffet/manager.h b/buffet/manager.h
index 6bfccd0..2bb9d5f 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -20,13 +20,15 @@
 #include "buffet/dbus_constants.h"
 #include "buffet/device_registration_info.h"
 
-namespace buffet {
-
-class CommandManager;
-
+namespace chromeos {
 namespace dbus_utils {
 class ExportedObjectManager;
 }  // namespace dbus_utils
+}  // namespace chromeos
+
+namespace buffet {
+
+class CommandManager;
 
 // The Manager is responsible for global state of Buffet.  It exposes
 // interfaces which affect the entire device such as device registration and
@@ -35,8 +37,8 @@
  public:
   typedef base::Callback<void(bool success)> OnInitFinish;
 
-  Manager(
-      const base::WeakPtr<dbus_utils::ExportedObjectManager>& object_manager);
+  Manager(const base::WeakPtr<chromeos::dbus_utils::ExportedObjectManager>&
+              object_manager);
   ~Manager();
   void Init(const OnInitFinish& cb);
 
@@ -72,7 +74,7 @@
       ::dbus::MethodCall* method_call);
 
   dbus::ExportedObject* exported_object_;  // weak; owned by the Bus object.
-  base::WeakPtr<dbus_utils::ExportedObjectManager> object_manager_;
+  base::WeakPtr<chromeos::dbus_utils::ExportedObjectManager> object_manager_;
   scoped_ptr<Properties> properties_;
 
   std::shared_ptr<CommandManager> command_manager_;