commit 4170585fe75d99036883229081420f2972dd4ec1
author Alex Vakulenko <avakulenko@google.com> Tue Oct 13 10:12:06 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Tue Oct 13 10:20:48 2015 -0700
tree 3bddf18b566ea5b7b0410410962de054254e9ea9
parent 297114c6c820d71bba206d1b2d38c98abc8540d9

weaved: Rename "chromeos" -> "brillo" in include paths and namespaces

libchromeos is transitioning to libbrillo and chromeos namespaces
and include directory is changing to brillo.

Bug: 24872993
Change-Id: Ic91fe342fb2c29ae915300d1ce9ae8473303238b

buffet/manager.h

diff --git a/buffet/manager.h b/buffet/manager.h
index a90925d..2a2b634 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -14,16 +14,16 @@
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <base/values.h>
-#include <chromeos/dbus/data_serialization.h>
-#include <chromeos/dbus/dbus_object.h>
-#include <chromeos/dbus/exported_property_set.h>
-#include <chromeos/errors/error.h>
+#include <brillo/dbus/data_serialization.h>
+#include <brillo/dbus/dbus_object.h>
+#include <brillo/dbus/exported_property_set.h>
+#include <brillo/errors/error.h>
 #include <weave/device.h>
 
 #include "buffet/buffet_config.h"
 #include "buffet/dbus_bindings/com.android.Weave.Manager.h"
 
-namespace chromeos {
+namespace brillo {
 namespace dbus_utils {
 class ExportedObjectManager;
 }  // namespace dbus_utils
@@ -40,11 +40,11 @@
 
 template<typename... Types>
 using DBusMethodResponsePtr =
-    std::unique_ptr<chromeos::dbus_utils::DBusMethodResponse<Types...>>;
+    std::unique_ptr<brillo::dbus_utils::DBusMethodResponse<Types...>>;
 
 template<typename... Types>
 using DBusMethodResponse =
-    chromeos::dbus_utils::DBusMethodResponse<Types...>;
+    brillo::dbus_utils::DBusMethodResponse<Types...>;
 
 // The Manager is responsible for global state of Buffet.  It exposes
 // interfaces which affect the entire device such as device registration and
@@ -62,30 +62,30 @@
 
   explicit Manager(
       const Options& options,
-      const base::WeakPtr<chromeos::dbus_utils::ExportedObjectManager>&
+      const base::WeakPtr<brillo::dbus_utils::ExportedObjectManager>&
           object_manager);
   ~Manager();
 
-  void Start(chromeos::dbus_utils::AsyncEventSequencer* sequencer);
+  void Start(brillo::dbus_utils::AsyncEventSequencer* sequencer);
 
   void Stop();
 
  private:
-  void RestartWeave(chromeos::dbus_utils::AsyncEventSequencer* sequencer);
+  void RestartWeave(brillo::dbus_utils::AsyncEventSequencer* sequencer);
   void CreateDevice();
 
   // DBus methods:
   void RegisterDevice(DBusMethodResponsePtr<std::string> response,
                       const std::string& ticket_id) override;
   void UpdateState(DBusMethodResponsePtr<> response,
-                   const chromeos::VariantDictionary& property_set) override;
-  bool GetState(chromeos::ErrorPtr* error, std::string* state) override;
+                   const brillo::VariantDictionary& property_set) override;
+  bool GetState(brillo::ErrorPtr* error, std::string* state) override;
   void AddCommand(DBusMethodResponsePtr<std::string> response,
                   const std::string& json_command) override;
   std::string TestMethod(const std::string& message) override;
 
   void StartPrivet(const Options& options,
-                   chromeos::dbus_utils::AsyncEventSequencer* sequencer);
+                   brillo::dbus_utils::AsyncEventSequencer* sequencer);
 
   void OnStateChanged();
   void OnGcdStateChanged(weave::GcdState state);
@@ -98,7 +98,7 @@
   Options options_;
 
   com::android::Weave::ManagerAdaptor dbus_adaptor_{this};
-  chromeos::dbus_utils::DBusObject dbus_object_;
+  brillo::dbus_utils::DBusObject dbus_object_;
 
   class TaskRunner;
   std::unique_ptr<TaskRunner> task_runner_;