Rename base/hash_tables to base/containers/hash_tables.

Remove forwarding header

BUG=
R=avi@chromium.org

Review URL: https://codereview.chromium.org/16667019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205584 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 19 insertions, 25 deletions

diff --git a/base/base.gypi b/base/base.gypi
index a227e56..ce8e95b 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -103,6 +103,7 @@
           'command_line.cc',
           'command_line.h',
           'compiler_specific.h',
+          'containers/hash_tables.h',
           'containers/linked_list.h',
           'containers/mru_cache.h',
           'containers/small_map.h',
@@ -192,7 +193,6 @@
           'guid_win.cc',
           'hash.cc',
           'hash.h',
-          'hash_tables.h',
           'hi_res_timer_manager_posix.cc',
           'hi_res_timer_manager_win.cc',
           'hi_res_timer_manager.h',
diff --git a/base/containers/mru_cache.h b/base/containers/mru_cache.h
index 0683ead..e59e909 100644
--- a/base/containers/mru_cache.h
+++ b/base/containers/mru_cache.h
@@ -21,7 +21,7 @@
 #include <utility>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 
 namespace base {
diff --git a/base/containers/small_map.h b/base/containers/small_map.h
index 2c9ca25..df3d22a 100644
--- a/base/containers/small_map.h
+++ b/base/containers/small_map.h
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/manual_constructor.h"
 
diff --git a/base/containers/small_map_unittest.cc b/base/containers/small_map_unittest.cc
index c90a303..b911bee6 100644
--- a/base/containers/small_map_unittest.cc
+++ b/base/containers/small_map_unittest.cc
@@ -10,8 +10,8 @@
 #include <functional>
 #include <map>
 
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
-#include "base/hash_tables.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h
index 68eb6c5..384e09f 100644
--- a/base/debug/trace_event_impl.h
+++ b/base/debug/trace_event_impl.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
-#include "base/hash_tables.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
diff --git a/base/files/file_path.h b/base/files/file_path.h
index 876cf03..0fb2285 100644
--- a/base/files/file_path.h
+++ b/base/files/file_path.h
@@ -108,7 +108,7 @@
 
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"  // For implicit conversions.
 #include "build/build_config.h"
diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc
index b715d69..8cf95ed 100644
--- a/base/files/file_path_watcher_linux.cc
+++ b/base/files/file_path_watcher_linux.cc
@@ -17,9 +17,9 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/containers/hash_tables.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
diff --git a/base/hash_tables.h b/base/hash_tables.h
deleted file mode 100644
index 4a4cb9f..0000000
--- a/base/hash_tables.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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.
-
-// TODO(brettw) remove this file when users are updated to the new version.
-#include "base/containers/hash_tables.h"
diff --git a/base/id_map.h b/base/id_map.h
index d3fc7b8..27098d2 100644
--- a/base/id_map.h
+++ b/base/id_map.h
@@ -8,7 +8,7 @@
 #include <set>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/threading/non_thread_safe.h"
 
diff --git a/base/metrics/stats_table.h b/base/metrics/stats_table.h
index 0abc214..153af38 100644
--- a/base/metrics/stats_table.h
+++ b/base/metrics/stats_table.h
@@ -24,7 +24,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_local_storage.h"
 
diff --git a/base/path_service.cc b/base/path_service.cc
index 32c6909..5cfb1ef 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -10,9 +10,9 @@
 #include <shlobj.h>
 #endif
 
+#include "base/containers/hash_tables.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
diff --git a/base/prefs/pref_notifier_impl.h b/base/prefs/pref_notifier_impl.h
index 8f5120a..655203d 100644
--- a/base/prefs/pref_notifier_impl.h
+++ b/base/prefs/pref_notifier_impl.h
@@ -10,7 +10,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/observer_list.h"
 #include "base/prefs/base_prefs_export.h"
 #include "base/prefs/pref_notifier.h"
diff --git a/base/prefs/pref_service.h b/base/prefs/pref_service.h
index 97ad15e..8af042f 100644
--- a/base/prefs/pref_service.h
+++ b/base/prefs/pref_service.h
@@ -16,7 +16,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
diff --git a/base/process/process_metrics_mac.cc b/base/process/process_metrics_mac.cc
index 74da992..048735e 100644
--- a/base/process/process_metrics_mac.cc
+++ b/base/process/process_metrics_mac.cc
@@ -9,7 +9,7 @@
 #include <mach/shared_region.h>
 #include <sys/sysctl.h>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/sys_info.h"
diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm
index 8f3b600..89b6db4 100644
--- a/base/process_util_mac.mm
+++ b/base/process_util_mac.mm
@@ -24,9 +24,9 @@
 #include <new>
 #include <string>
 
+#include "base/containers/hash_tables.h"
 #include "base/debug/debugger.h"
 #include "base/file_util.h"
-#include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
diff --git a/base/strings/string_piece.h b/base/strings/string_piece.h
index a433a44..818d6ca 100644
--- a/base/strings/string_piece.h
+++ b/base/strings/string_piece.h
@@ -30,7 +30,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/strings/string16.h"
 
 namespace base {
@@ -409,9 +409,9 @@ BASE_EXPORT std::ostream& operator<<(std::ostream& o,
 // We provide appropriate hash functions so StringPiece and StringPiece16 can
 // be used as keys in hash sets and maps.
 
-// This hash function is copied from base/hash_tables.h. We don't use the
-// ones already defined for string and string16 directly because it would
-// require the string constructors to be called, which we don't want.
+// This hash function is copied from base/containers/hash_tables.h. We don't
+// use the ones already defined for string and string16 directly because it
+// would require the string constructors to be called, which we don't want.
 #define HASH_STRING_PIECE(StringPieceType, string_piece)                \
   std::size_t result = 0;                                               \
   for (StringPieceType::const_iterator i = string_piece.begin();        \
diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc
index a61441f..50aefd8 100644
--- a/base/test/multiprocess_test_android.cc
+++ b/base/test/multiprocess_test_android.cc
@@ -6,7 +6,7 @@
 
 #include <unistd.h>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process.h"