Use a direct include of strings headers in testing/, third_party/, tools/.

tools/android/forwarder2/command.cc

 // Copyright (c) 2012 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 "tools/android/forwarder2/command.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
 #include "base/safe_strerror_posix.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "tools/android/forwarder2/socket.h"
 
 using base::StringPiece;
 
 namespace {
 
 
 // Command format:
 //      <port>:<type>
@@ skipping 62 matching lines @@
 
 bool ReceivedCommand(command::Type command, Socket* socket) {
   int port;
   command::Type received_command;
   if (!ReadCommand(socket, &port, &received_command))
     return false;
   return received_command == command;
 }
 
 }  // namespace forwarder