commit 0801a1f20a0c8f34130d567cd3b7dcbd2be9cb3c
author Vitaly Buka <vitalybuka@chromium.org> Fri Aug 14 10:03:46 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Tue Aug 18 11:15:31 2015 -0700
tree 2b5bdffb4dd585c44597c10f8c661d90ec5b9efe
parent 24d6fd54e9b10ae13e09ca91c726a994853def0d

libweave: Copy chromeos::Error into libweave

To move dependency on libchromeos.

BUG=brillo:1257
TEST=`FEATURES=test emerge-gizmo libweave buffet`
CQ-DEPEND=CL:293873

Change-Id: Icc3df36b34431987802fe752ae4a129438c57a9d
Reviewed-on: https://chromium-review.googlesource.com/293615
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>

libweave/src/states/state_manager.h

diff --git a/libweave/src/states/state_manager.h b/libweave/src/states/state_manager.h
index 30825bd..1668bb2 100644
--- a/libweave/src/states/state_manager.h
+++ b/libweave/src/states/state_manager.h
@@ -14,7 +14,7 @@
 
 #include <base/callback.h>
 #include <base/macros.h>
-#include <chromeos/errors/error.h>
+#include <weave/error.h>
 #include <weave/state.h>
 
 #include "libweave/src/states/state_change_queue_interface.h"
@@ -39,7 +39,7 @@
   // State overrides.
   void AddOnChangedCallback(const base::Closure& callback) override;
   bool SetProperties(const base::DictionaryValue& property_set,
-                     chromeos::ErrorPtr* error) override;
+                     ErrorPtr* error) override;
   std::unique_ptr<base::DictionaryValue> GetStateValuesAsJson() const override;
 
   // Initializes the state manager and load device state fragments.
@@ -73,33 +73,31 @@
   bool SetPropertyValue(const std::string& full_property_name,
                         const base::Value& value,
                         const base::Time& timestamp,
-                        chromeos::ErrorPtr* error);
+                        ErrorPtr* error);
 
   // Loads a device state fragment from a JSON object. |category| represents
   // a device daemon providing the state fragment or empty string for the
   // base state fragment.
   bool LoadStateDefinition(const base::DictionaryValue& json,
                            const std::string& category,
-                           chromeos::ErrorPtr* error);
+                           ErrorPtr* error);
 
   // Loads a device state fragment JSON file. The file name (without extension)
   // is used as the state fragment category.
   bool LoadStateDefinition(const base::FilePath& json_file_path,
-                           chromeos::ErrorPtr* error);
+                           ErrorPtr* error);
 
   // Loads the base device state fragment JSON file. This state fragment
   // defines the standard state properties from the 'base' package as defined
   // by GCD specification.
   bool LoadBaseStateDefinition(const base::FilePath& json_file_path,
-                               chromeos::ErrorPtr* error);
+                               ErrorPtr* error);
 
   // Loads state default values from JSON object.
-  bool LoadStateDefaults(const base::DictionaryValue& json,
-                         chromeos::ErrorPtr* error);
+  bool LoadStateDefaults(const base::DictionaryValue& json, ErrorPtr* error);
 
   // Loads state default values from JSON file.
-  bool LoadStateDefaults(const base::FilePath& json_file_path,
-                         chromeos::ErrorPtr* error);
+  bool LoadStateDefaults(const base::FilePath& json_file_path, ErrorPtr* error);
 
   // Finds a package by its name. Returns nullptr if not found.
   StatePackage* FindPackage(const std::string& package_name);