Normalize parameters to AdbClientSocket::CommandCallback parameters

chrome/browser/devtools/adb_client_socket.cc

 // Copyright (c) 2013 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 "chrome/browser/devtools/adb_client_socket.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 140 matching lines @@
     if (!CheckNetResultOrDie(result))
       return;
     if (result == 0) {
       CheckNetResultOrDie(net::ERR_CONNECTION_CLOSED);
       return;
     }
 
     response_ += std::string(response_buffer->data(), result);
     int expected_length = 0;
     if (bytes_total < 0) {
+      // TODO(kaznacheev): Use net::HttpResponseHeader to parse the header.
       size_t content_pos = response_.find("Content-Length:");
       if (content_pos != std::string::npos) {
         size_t endline_pos = response_.find("\n", content_pos);
         if (endline_pos != std::string::npos) {
           std::string len = response_.substr(content_pos + 15,
                                              endline_pos - content_pos - 15);
           TrimWhitespace(len, TRIM_ALL, &len);
           if (!base::StringToInt(len, &expected_length)) {
             CheckNetResultOrDie(net::ERR_FAILED);
             return;
           }
         }
       }
 
       body_pos_ = response_.find("\r\n\r\n");
       if (body_pos_ != std::string::npos) {
         body_pos_ += 4;
         bytes_total = body_pos_ + expected_length;
       }
     }
 
     if (bytes_total == static_cast<int>(response_.length())) {
       if (!command_callback_.is_null())
-        command_callback_.Run(body_pos_, response_);
+        command_callback_.Run(net::OK, response_.substr(body_pos_));
       else
         socket_callback_.Run(net::OK, socket_.release());
       delete this;
       return;
     }
 
     result = socket_->Read(response_buffer.get(),
                            kBufferSize,
                            base::Bind(&HttpOverAdbSocket::OnResponseData,
                                       base::Unretained(this),
@@ skipping 258 matching lines @@
                                     base::Unretained(this),
                                     callback,
                                     new_response,
                                     response_buffer,
                                     bytes_left));
   if (result > 0)
     OnResponseData(callback, new_response, response_buffer, bytes_left, result);
   else if (result != net::ERR_IO_PENDING)
     callback.Run(net::OK, new_response);
 }