Fix GnubbyAuthHandlerPosix to handle requests correctly.

remoting/host/gnubby_socket.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/gnubby_socket.h"
 
+#include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 
 namespace remoting {
 
 namespace {
 
@@ skipping 48 matching lines @@
 
 void GnubbySocket::SendSshError() {
   DCHECK(CalledOnValidThread());
 
   SendResponse(std::string(kSshError, arraysize(kSshError)));
 }
 
 void GnubbySocket::StartReadingRequest(
     const base::Closure& request_received_callback) {
   DCHECK(CalledOnValidThread());
+  DCHECK(request_received_callback_.is_null());
 
   request_received_callback_ = request_received_callback;
   DoRead();
 }
 
 void GnubbySocket::OnDataWritten(int result) {
   DCHECK(CalledOnValidThread());
   DCHECK(write_buffer_);
 
   if (result < 0) {
-    LOG(ERROR) << "Error in sending response.";
+    LOG(ERROR) << "Error sending response: " << result;
     return;
   }
   ResetTimer();
   write_buffer_->DidConsume(result);
   DoWrite();
 }
 
 void GnubbySocket::DoWrite() {
   DCHECK(CalledOnValidThread());
   DCHECK(write_buffer_);
 
   if (!write_buffer_->BytesRemaining()) {
     write_buffer_ = nullptr;
     return;
   }
   int result = socket_->Write(
       write_buffer_.get(), write_buffer_->BytesRemaining(),
       base::Bind(&GnubbySocket::OnDataWritten, base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnDataWritten(result);
 }
 
-void GnubbySocket::OnDataRead(int bytes_read) {
+void GnubbySocket::OnDataRead(int result) {
   DCHECK(CalledOnValidThread());
 
-  if (bytes_read < 0) {
-    LOG(ERROR) << "Error in reading request.";
+  if (result <= 0) {
+    if (result < 0)
+      LOG(ERROR) << "Error reading request: " << result;
     read_completed_ = true;
-    request_received_callback_.Run();
+    base::ResetAndReturn(&request_received_callback_).Run();
     return;
   }
+
   ResetTimer();
   request_data_.insert(request_data_.end(), read_buffer_->data(),
-                       read_buffer_->data() + bytes_read);
+                       read_buffer_->data() + result);
   if (IsRequestComplete()) {
     read_completed_ = true;
-    request_received_callback_.Run();
+    base::ResetAndReturn(&request_received_callback_).Run();
     return;
   }
+
   DoRead();
 }
 
 void GnubbySocket::DoRead() {
   DCHECK(CalledOnValidThread());
 
   int result = socket_->Read(
       read_buffer_.get(), kRequestReadBufferLength,
       base::Bind(&GnubbySocket::OnDataRead, base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
@@ skipping 37 matching lines @@
 
   return response_len;
 }
 
 void GnubbySocket::ResetTimer() {
   if (timer_->IsRunning())
     timer_->Reset();
 }
 
 }  // namespace remoting