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/commands/command_dictionary.h

diff --git a/libweave/src/commands/command_dictionary.h b/libweave/src/commands/command_dictionary.h
index 9a3c407..1f18257 100644
--- a/libweave/src/commands/command_dictionary.h
+++ b/libweave/src/commands/command_dictionary.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include <base/macros.h>
-#include <chromeos/errors/error.h>
+#include <weave/error.h>
 
 #include "libweave/src/commands/command_definition.h"
 
@@ -56,7 +56,7 @@
   bool LoadCommands(const base::DictionaryValue& json,
                     const std::string& category,
                     const CommandDictionary* base_commands,
-                    chromeos::ErrorPtr* error);
+                    ErrorPtr* error);
   // Converts all the command definitions to a JSON object for CDD/Device
   // draft.
   // |filter| is a predicate used to filter out the command definitions to
@@ -69,7 +69,7 @@
   std::unique_ptr<base::DictionaryValue> GetCommandsAsJson(
       const std::function<bool(const CommandDefinition*)>& filter,
       bool full_schema,
-      chromeos::ErrorPtr* error) const;
+      ErrorPtr* error) const;
   // Returns the number of command definitions in the dictionary.
   size_t GetSize() const { return definitions_.size(); }
   // Checks if the dictionary has no command definitions.
@@ -88,7 +88,7 @@
       const char* property_name,
       const ObjectSchema* base_def,
       const std::string& command_name,
-      chromeos::ErrorPtr* error);
+      ErrorPtr* error);
 
   CommandMap definitions_;  // List of all available command definitions.
   DISALLOW_COPY_AND_ASSIGN(CommandDictionary);