Use a direct include of strings headers in base/.

base/containers/hash_tables.h

 // Copyright (c) 2011 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.
 //
 
 //
 // Deal with the differences between Microsoft and GNU implemenations
 // of hash_map. Allows all platforms to use |base::hash_map| and
 // |base::hash_set|.
 //  eg:
 //   base::hash_map<int> my_map;
 //   base::hash_set<int> my_set;
 //
 // NOTE: It is an explicit non-goal of this class to provide a generic hash
 // function for pointers.  If you want to hash a pointers to a particular class,
 // please define the template specialization elsewhere (for example, in its
 // header file) and keep it specific to just pointers to that class.  This is
 // because identity hashes are not desirable for all types that might show up
 // in containers as pointers.
 
 #ifndef BASE_CONTAINERS_HASH_TABLES_H_
 #define BASE_CONTAINERS_HASH_TABLES_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 #include <hash_map>
 #include <hash_set>
 
 #define BASE_HASH_NAMESPACE stdext
 
 #elif defined(COMPILER_GCC)
 #if defined(OS_ANDROID)
@@ skipping 76 matching lines @@
 #endif  // COMPILER
 
 namespace base {
 using BASE_HASH_NAMESPACE::hash_map;
 using BASE_HASH_NAMESPACE::hash_multimap;
 using BASE_HASH_NAMESPACE::hash_multiset;
 using BASE_HASH_NAMESPACE::hash_set;
 }
 
 #endif  // BASE_CONTAINERS_HASH_TABLES_H_