commit 0fef815c8c01278307e211b6952efbca53d82132
author Alex Vakulenko <avakulenko@google.com> Fri Sep 25 08:45:22 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Fri Sep 25 08:46:59 2015 -0700
tree 06b7d146fdb3391e64f70ae2d9fc5fc5756499da
parent b2fc69081117e855edfd710b5c9e079674b13bd0

Pull new version of libweave and update weaved's implementation

libweave had some interface clean-up work done, so reflecting the
current state of library in Brillo.

Change-Id: I987ed3721df917fe59f623a8e00110e2ede4f72f

buffet/socket_stream.cc

diff --git a/buffet/socket_stream.cc b/buffet/socket_stream.cc
index 9ce56bf..8ee9c60 100644
--- a/buffet/socket_stream.cc
+++ b/buffet/socket_stream.cc
@@ -69,11 +69,10 @@
 
 }  // namespace
 
-void SocketStream::ReadAsync(
-    void* buffer,
-    size_t size_to_read,
-    const base::Callback<void(size_t)>& success_callback,
-    const base::Callback<void(const weave::Error*)>& error_callback) {
+void SocketStream::Read(void* buffer,
+                        size_t size_to_read,
+                        const ReadSuccessCallback& success_callback,
+                        const weave::ErrorCallback& error_callback) {
   chromeos::ErrorPtr chromeos_error;
   if (!ptr_->ReadAsync(buffer, size_to_read, success_callback,
                        base::Bind(&OnError, error_callback), &chromeos_error)) {
@@ -84,11 +83,10 @@
   }
 }
 
-void SocketStream::WriteAllAsync(
-    const void* buffer,
-    size_t size_to_write,
-    const base::Closure& success_callback,
-    const base::Callback<void(const weave::Error*)>& error_callback) {
+void SocketStream::Write(const void* buffer,
+                         size_t size_to_write,
+                         const weave::SuccessCallback& success_callback,
+                         const weave::ErrorCallback& error_callback) {
   chromeos::ErrorPtr chromeos_error;
   if (!ptr_->WriteAllAsync(buffer, size_to_write, success_callback,
                            base::Bind(&OnError, error_callback),
@@ -100,7 +98,7 @@
   }
 }
 
-void SocketStream::CancelPendingAsyncOperations() {
+void SocketStream::CancelPendingOperations() {
   ptr_->CancelPendingAsyncOperations();
 }
 
@@ -124,7 +122,7 @@
     std::unique_ptr<Stream> socket,
     const std::string& host,
     const base::Callback<void(std::unique_ptr<Stream>)>& success_callback,
-    const base::Callback<void(const weave::Error*)>& error_callback) {
+    const weave::ErrorCallback& error_callback) {
   SocketStream* stream = static_cast<SocketStream*>(socket.get());
   chromeos::TlsStream::Connect(std::move(stream->ptr_), host,
                                base::Bind(&OnSuccess, success_callback),