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/shill_client.cc

diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index e0babfc..36918ab 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -133,7 +133,7 @@
     weave::Error::AddTo(&error, FROM_HERE, kErrorDomain, "busy",
                         "Already connecting to WiFi network");
     base::MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(error_callback, base::Owned(error.release())));
+        FROM_HERE, base::Bind(error_callback, base::Passed(&error)));
     return;
   }
   CleanupConnectingService();
@@ -157,7 +157,7 @@
     ConvertError(*chromeos_error, &weave_error);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(error_callback, base::Owned(weave_error.release())));
+        base::Bind(error_callback, base::Passed(&weave_error)));
     return;
   }
   connecting_service_.reset(new ServiceProxy{bus_, service_path});
@@ -481,7 +481,7 @@
                       "Failed to connect to WiFi network");
 
   if (!callback.is_null())
-    callback.Run(weave_error.get());
+    callback.Run(std::move(weave_error));
 }
 
 void ShillClient::OnStrengthChangeForConnectingService(
@@ -535,10 +535,9 @@
   // underway.  Therefore, call our callbacks later, when we're in a good
   // state.
   base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&ShillClient::NotifyConnectivityListeners,
-                 weak_factory_.GetWeakPtr(),
-                 GetConnectionState() == Network::State::kOnline));
+      FROM_HERE, base::Bind(&ShillClient::NotifyConnectivityListeners,
+                            weak_factory_.GetWeakPtr(),
+                            GetConnectionState() == Network::State::kOnline));
 }
 
 void ShillClient::NotifyConnectivityListeners(bool am_online) {
@@ -560,9 +559,8 @@
 void ShillClient::OpenSslSocket(
     const std::string& host,
     uint16_t port,
-    const base::Callback<void(std::unique_ptr<weave::Stream>)>&
-        success_callback,
-    const base::Callback<void(const weave::Error*)>& error_callback) {
+    const OpenSslSocketSuccessCallback& success_callback,
+    const weave::ErrorCallback& error_callback) {
   if (disable_xmpp_)
     return;
   std::unique_ptr<weave::Stream> raw_stream{
@@ -574,7 +572,7 @@
     ConvertError(*error.get(), &weave_error);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(error_callback, base::Owned(weave_error.release())));
+        base::Bind(error_callback, base::Passed(&weave_error)));
     return;
   }