Use a direct include of strings headers in extensions/, google_apis/, gpu/.

gpu/config/gpu_info_collector_android.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 "gpu/config/gpu_info_collector.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 
 namespace {
 
 std::string GetDriverVersionFromString(const std::string& version_string) {
   // Extract driver version from the second number in a string like:
   // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)"
 
   // Exclude first "2.0".
   size_t begin = version_string.find_first_of("0123456789");
   if (begin == std::string::npos)
@@ skipping 47 matching lines @@
       gpu_info->gl_version_string);
   return true;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu