Use a direct include of strings headers in base/.

base/location.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 "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 // MSDN says to #include <intrin.h>, but that breaks the VS2005 build.
 extern "C" {
   void* _ReturnAddress();
 }
 #endif
 
 #include "base/location.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 
 namespace tracked_objects {
 
 Location::Location(const char* function_name,
                    const char* file_name,
                    int line_number,
                    const void* program_counter)
     : function_name_(function_name),
       file_name_(file_name),
       line_number_(line_number),
@@ skipping 66 matching lines @@
 #if defined(COMPILER_MSVC)
   return _ReturnAddress();
 #elif defined(COMPILER_GCC)
   return __builtin_extract_return_addr(__builtin_return_address(0));
 #endif  // COMPILER_GCC
 
   return NULL;
 }
 
 }  // namespace tracked_objects