Use a direct include of strings headers in chrome/test/.

chrome/test/chromedriver/net/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/test/chromedriver/net/adb_client_socket.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace {
 
 const int kBufferSize = 16 * 1024;
 const int kResponseBufferSize = 16;
@@ skipping 459 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);
 }