libweave uprev

am: 34183c1b5b

* commit '34183c1b5b678a9726a955db9e05a361ed05eeac':
  libweave uprev

3 files changed, 26 insertions, 16 deletions

diff --git a/buffet/binder_command_proxy.cc b/buffet/binder_command_proxy.cc
index 487f6cc..b099589 100644
--- a/buffet/binder_command_proxy.cc
+++ b/buffet/binder_command_proxy.cc
@@ -28,8 +28,6 @@ namespace buffet {
 
 namespace {
 
-const char kErrorDomain[] = "weaved";
-
 android::binder::Status ReportDestroyedError() {
   return android::binder::Status::fromServiceSpecificError(
       1, android::String8{"Command has been destroyed"});
@@ -144,8 +142,8 @@ android::binder::Status BinderCommandProxy::abort(
   if (!command)
     return ReportDestroyedError();
   weave::ErrorPtr command_error;
-  weave::Error::AddTo(&command_error, FROM_HERE, kErrorDomain,
-                      ToString(errorCode), ToString(errorMessage));
+  weave::Error::AddTo(&command_error, FROM_HERE, ToString(errorCode),
+                      ToString(errorMessage));
   weave::ErrorPtr error;
   return ToStatus(command->Abort(command_error.get(), &error), &error);
 }
@@ -173,8 +171,8 @@ android::binder::Status BinderCommandProxy::setError(
   if (!command)
     return ReportDestroyedError();
   weave::ErrorPtr command_error;
-  weave::Error::AddTo(&command_error, FROM_HERE, kErrorDomain,
-                      ToString(errorCode), ToString(errorMessage));
+  weave::Error::AddTo(&command_error, FROM_HERE, ToString(errorCode),
+                      ToString(errorMessage));
   weave::ErrorPtr error;
   return ToStatus(command->SetError(command_error.get(), &error), &error);
 }
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index 654fe4f..c68766a 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -44,8 +44,6 @@ namespace buffet {
 
 namespace {
 
-const char kErrorDomain[] = "buffet";
-
 void IgnoreDetachEvent() {}
 
 bool GetStateForService(ServiceProxy* service, string* state) {
@@ -143,7 +141,7 @@ void ShillClient::Connect(const string& ssid,
   LOG(INFO) << "Connecting to WiFi network: " << ssid;
   if (connecting_service_) {
     weave::ErrorPtr error;
-    weave::Error::AddTo(&error, FROM_HERE, kErrorDomain, "busy",
+    weave::Error::AddTo(&error, FROM_HERE, "busy",
                         "Already connecting to WiFi network");
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, base::Passed(&error)));
@@ -494,7 +492,7 @@ void ShillClient::OnErrorChangeForConnectingService(const std::string& error) {
   CleanupConnectingService();
 
   weave::ErrorPtr weave_error;
-  weave::Error::AddTo(&weave_error, FROM_HERE, kErrorDomain, error,
+  weave::Error::AddTo(&weave_error, FROM_HERE, error,
                       "Failed to connect to WiFi network");
 
   if (!callback.is_null())
diff --git a/buffet/weave_error_conversion.h b/buffet/weave_error_conversion.h
index 17a3487..a95e43c 100644
--- a/buffet/weave_error_conversion.h
+++ b/buffet/weave_error_conversion.h
@@ -23,20 +23,34 @@
 
 namespace buffet {
 
-template <class Source, class Destination>
-void ConvertError(const Source& source,
-                  std::unique_ptr<Destination>* destination) {
-  const Source* inner_error = source.GetInnerError();
+inline void ConvertError(const weave::Error& source,
+                         std::unique_ptr<brillo::Error>* destination) {
+  const weave::Error* inner_error = source.GetInnerError();
   if (inner_error)
     ConvertError(*inner_error, destination);
 
   const auto& location = source.GetLocation();
-  Destination::AddTo(
+  brillo::Error::AddTo(
       destination,
       tracked_objects::Location{
           location.function_name.c_str(), location.file_name.c_str(),
           location.line_number, tracked_objects::GetProgramCounter()},
-      source.GetDomain(), source.GetCode(), source.GetMessage());
+      "weave", source.GetCode(), source.GetMessage());
+}
+
+inline void ConvertError(const brillo::Error& source,
+                         std::unique_ptr<weave::Error>* destination) {
+  const brillo::Error* inner_error = source.GetInnerError();
+  if (inner_error)
+    ConvertError(*inner_error, destination);
+
+  const auto& location = source.GetLocation();
+  weave::Error::AddTo(
+      destination,
+      tracked_objects::Location{
+          location.function_name.c_str(), location.file_name.c_str(),
+          location.line_number, tracked_objects::GetProgramCounter()},
+      source.GetCode(), source.GetMessage());
 }
 
 }  // namespace buffet