commit 297114c6c820d71bba206d1b2d38c98abc8540d9
author Alex Vakulenko <avakulenko@google.com> Mon Oct 12 13:45:43 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Mon Oct 12 14:02:16 2015 -0700
tree 0bf5821f8affd64b11ddfba86e690358078177fd
parent abbcdea13c174d70cc4af0abd0dadb091a698da8

Update weaved to reflect new interface changes in libweave

Pulling the following commits from libweave public repo:

f7f52d47 - Pass error as ErrorPtr into ErrorCallback
7a35005c - Added few logging for command notification and DNS-SD updates
96cc933e - Ordered includes
1a42e146 - Replace type of method parameter of HttpClient::SendRequest with enum
17280378 - Cleanup mock_http_client.h
226842f8 - Fixed inconsistent type for RegisterCallbacks
4774df27 - Async RegisterDevice implementation
533dd429 - Allow multiple calls Request::GetData
890124a1 - Add --v switch into example code
866b60a1 - Remove request id from HTTP client

Change-Id: If52121f9a6e70ecf60c791fc3b839f0a35904c8b

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index 3f3f4c1..752ab16 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -131,7 +131,7 @@
 
 void RegisterDeviceError(
     const std::shared_ptr<DBusMethodResponse<std::string>>& response,
-    const weave::Error* weave_error) {
+    weave::ErrorPtr weave_error) {
   chromeos::ErrorPtr error;
   ConvertError(*weave_error, &error);
   response->ReplyWithError(error.get());
@@ -188,9 +188,9 @@
     if (options_.enable_ping) {
       auto ping_handler = base::Bind(
           [](std::unique_ptr<weave::provider::HttpServer::Request> request) {
-        request->SendReply(chromeos::http::status_code::Ok, "Hello, world!",
-                           chromeos::mime::text::kPlain);
-      });
+            request->SendReply(chromeos::http::status_code::Ok, "Hello, world!",
+                               chromeos::mime::text::kPlain);
+          });
       http_server->AddHttpRequestHandler("/privet/ping", ping_handler);
       http_server->AddHttpsRequestHandler("/privet/ping", ping_handler);
     }
@@ -251,10 +251,9 @@
   std::shared_ptr<DBusMethodResponse<std::string>> shared_response =
       std::move(response);
 
-  device_->Register(
-      ticket_id,
-      base::Bind(&RegisterDeviceSuccess, shared_response, device_.get()),
-      base::Bind(&RegisterDeviceError, shared_response));
+  device_->Register(ticket_id, base::Bind(&RegisterDeviceSuccess,
+                                          shared_response, device_.get()),
+                    base::Bind(&RegisterDeviceError, shared_response));
 }
 
 void Manager::UpdateState(DBusMethodResponsePtr<> response,