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

apps/saved_files_service.cc

@@ -8,7 +8,7 @@
 
 #include "apps/saved_files_service_factory.h"
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/value_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_prefs.h"

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',

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 {

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"
 

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 {

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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();        \

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"

cc/animation/animation_registrar.h

@@ -5,7 +5,7 @@
 #ifndef CC_ANIMATION_ANIMATION_REGISTRAR_H_
 #define CC_ANIMATION_ANIMATION_REGISTRAR_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 "cc/base/cc_export.h"

cc/animation/layer_animation_controller.h

@@ -6,7 +6,7 @@
 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 
 #include "base/basictypes.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"

cc/base/hash_pair.h

@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 
 #if defined(COMPILER_MSVC)
 

cc/base/scoped_ptr_hash_map.h

@@ -9,7 +9,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/scoped_ptr.h"
 #include "base/stl_util.h"

cc/base/worker_pool.cc

@@ -12,8 +12,8 @@
 #include <map>
 
 #include "base/bind.h"
+#include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
-#include "base/hash_tables.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread_restrictions.h"

cc/layers/delegated_renderer_layer_impl.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/quad_sink.h"

cc/layers/delegated_renderer_layer_impl.h

@@ -5,7 +5,7 @@
 #ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"

cc/output/direct_renderer.cc

@@ -7,8 +7,8 @@
 #include <utility>
 #include <vector>
 
+#include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
-#include "base/hash_tables.h"
 #include "base/metrics/histogram.h"
 #include "cc/base/math_util.h"
 #include "cc/output/copy_output_request.h"

cc/quads/render_pass.h

@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/hash_pair.h"
 #include "cc/base/scoped_ptr_hash_map.h"

cc/resources/picture.h

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
-#include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"

cc/resources/picture_layer_tiling.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/hash_pair.h"

cc/resources/picture_pile_base.h

@@ -8,7 +8,7 @@
 #include <list>
 #include <utility>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/hash_pair.h"

cc/resources/prioritized_resource_manager.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/cc_export.h"

cc/resources/raster_worker_pool.h

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "cc/base/worker_pool.h"
 #include "cc/resources/resource_provider.h"
 

cc/resources/resource_provider.cc

@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/containers/hash_tables.h"
 #include "base/debug/alias.h"
-#include "base/hash_tables.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"

cc/resources/resource_provider.h

@@ -12,7 +12,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "cc/base/cc_export.h"

cc/resources/tile_manager.h

@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/debug/rendering_stats_instrumentation.h"

cc/test/test_web_graphics_context_3d.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"

cc/trees/damage_tracker.h

@@ -6,7 +6,7 @@
 #define CC_TREES_DAMAGE_TRACKER_H_
 
 #include <vector>
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"

cc/trees/layer_sorter.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "ui/gfx/point3_f.h"

cc/trees/layer_tree_host.h

@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.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/memory/weak_ptr.h"

cc/trees/layer_tree_host_impl_unittest.cc

@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "cc/base/math_util.h"
 #include "cc/input/top_controls_manager.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"

cc/trees/layer_tree_impl.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/hash_tables.h"
+#include "base/containers/hash_tables.h"
 #include "base/values.h"
 #include "cc/layers/layer_impl.h"
 #include "ui/base/latency_info.h"