diff options
229 files changed, 247 insertions, 255 deletions
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index aeefa39..13767b7 100644 --- a/apps/saved_files_service.cc +++ b/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" 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" diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h index 5bba0d1..579b11f 100644 --- a/cc/animation/animation_registrar.h +++ b/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" diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h index 9ee43d2..3997767 100644 --- a/cc/animation/layer_animation_controller.h +++ b/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" diff --git a/cc/base/hash_pair.h b/cc/base/hash_pair.h index 5e0aa08..586d781 100644 --- a/cc/base/hash_pair.h +++ b/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) diff --git a/cc/base/scoped_ptr_hash_map.h b/cc/base/scoped_ptr_hash_map.h index af792ec..49421c3 100644 --- a/cc/base/scoped_ptr_hash_map.h +++ b/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" diff --git a/cc/base/worker_pool.cc b/cc/base/worker_pool.cc index b22ed53..6dc5bfd 100644 --- a/cc/base/worker_pool.cc +++ b/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" diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc index f193098..38886aa 100644 --- a/cc/layers/delegated_renderer_layer_impl.cc +++ b/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" diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h index 862b725..5725454 100644 --- a/cc/layers/delegated_renderer_layer_impl.h +++ b/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" diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc index 76c5426..e144f2f 100644 --- a/cc/output/direct_renderer.cc +++ b/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" diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index c2df5b5..14c657e 100644 --- a/cc/quads/render_pass.h +++ b/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" diff --git a/cc/resources/picture.h b/cc/resources/picture.h index e48a40b..93d326f 100644 --- a/cc/resources/picture.h +++ b/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" diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h index 4fa772c..3f4a5daa 100644 --- a/cc/resources/picture_layer_tiling.h +++ b/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" diff --git a/cc/resources/picture_pile_base.h b/cc/resources/picture_pile_base.h index 6a2e83c..b39c228 100644 --- a/cc/resources/picture_pile_base.h +++ b/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" diff --git a/cc/resources/prioritized_resource_manager.h b/cc/resources/prioritized_resource_manager.h index a199ea7..7396772 100644 --- a/cc/resources/prioritized_resource_manager.h +++ b/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" diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h index ade8432..7205a42 100644 --- a/cc/resources/raster_worker_pool.h +++ b/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" diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 6d1101d..d0b4de7 100644 --- a/cc/resources/resource_provider.cc +++ b/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" diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h index ced287d..d8b89c24 100644 --- a/cc/resources/resource_provider.h +++ b/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" diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h index 03cc8308..7d3cb2a 100644 --- a/cc/resources/tile_manager.h +++ b/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" diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h index 449b2bb..bdec155 100644 --- a/cc/test/test_web_graphics_context_3d.h +++ b/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" diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h index 0627687..716e573 100644 --- a/cc/trees/damage_tracker.h +++ b/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" diff --git a/cc/trees/layer_sorter.h b/cc/trees/layer_sorter.h index 4bdf77c..361a5c8 100644 --- a/cc/trees/layer_sorter.h +++ b/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" diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index 28beb1f..2c733fc 100644 --- a/cc/trees/layer_tree_host.h +++ b/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" diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 097244c..8ceb6bd 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/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" diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index 304dbb9..b060c0d 100644 --- a/cc/trees/layer_tree_impl.h +++ b/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" diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc index c26c2b5..9c4461d 100644 --- a/cc/trees/tree_synchronizer.cc +++ b/cc/trees/tree_synchronizer.cc @@ -4,8 +4,8 @@ #include "cc/trees/tree_synchronizer.h" +#include "base/containers/hash_tables.h" #include "base/debug/trace_event.h" -#include "base/hash_tables.h" #include "base/logging.h" #include "cc/animation/scrollbar_animation_controller.h" #include "cc/input/scrollbar.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index f7fdb4b..2f8551c 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/path_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index 4ea0663..c5894e5 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" namespace chromeos { diff --git a/chrome/browser/chromeos/external_metrics_unittest.cc b/chrome/browser/chromeos/external_metrics_unittest.cc index 0487953..cae15b7 100644 --- a/chrome/browser/chromeos/external_metrics_unittest.cc +++ b/chrome/browser/chromeos/external_metrics_unittest.cc @@ -6,7 +6,7 @@ #include <sys/file.h> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/external_metrics.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h index 70599cc..ac1fdf7 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.h +++ b/chrome/browser/chromeos/input_method/input_method_util.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chromeos/ime/input_method_descriptor.h" diff --git a/chrome/browser/chromeos/login/screens/screen_context.h b/chrome/browser/chromeos/login/screens/screen_context.h index 96c60c5..57ccf83 100644 --- a/chrome/browser/chromeos/login/screens/screen_context.h +++ b/chrome/browser/chromeos/login/screens/screen_context.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/strings/string16.h" diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.h b/chrome/browser/chromeos/memory/oom_priority_manager.h index f9edb88..56f8668 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager.h +++ b/chrome/browser/chromeos/memory/oom_priority_manager.h @@ -8,8 +8,8 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" #include "base/strings/string16.h" diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h index 959de48..bbc40f9 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/cancelable_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/memory/weak_ptr.h" diff --git a/chrome/browser/chromeos/net/network_portal_detector_stub.h b/chrome/browser/chromeos/net/network_portal_detector_stub.h index bfdf36f..8623503 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_stub.h +++ b/chrome/browser/chromeos/net/network_portal_detector_stub.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/net/network_portal_detector.h" diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h index 610d54a..e14b2be 100644 --- a/chrome/browser/chromeos/settings/cros_settings.h +++ b/chrome/browser/chromeos/settings/cros_settings.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" diff --git a/chrome/browser/command_updater.h b/chrome/browser/command_updater.h index c0b83b3..a297a49 100644 --- a/chrome/browser/command_updater.h +++ b/chrome/browser/command_updater.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_COMMAND_UPDATER_H_ #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "ui/base/window_open_disposition.h" class CommandObserver; diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h index d82fbcd..f1aa32d 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_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 "chrome/browser/download/download_path_reservation_tracker.h" diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h index 9b6fb77..97af916 100644 --- a/chrome/browser/extensions/activity_log/activity_log.h +++ b/chrome/browser/extensions/activity_log/activity_log.h @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/singleton.h" #include "base/observer_list_threadsafe.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/extensions/api/declarative/deduping_factory.h b/chrome/browser/extensions/api/declarative/deduping_factory.h index b34d9a0..73dbf79 100644 --- a/chrome/browser/extensions/api/declarative/deduping_factory.h +++ b/chrome/browser/extensions/api/declarative/deduping_factory.h @@ -9,7 +9,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/stl_util.h" diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.h b/chrome/browser/extensions/api/declarative_content/content_condition.h index 0adea94..351aa43 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition.h +++ b/chrome/browser/extensions/api/declarative_content/content_condition.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#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/values.h" diff --git a/chrome/browser/extensions/api/dial/dial_registry.h b/chrome/browser/extensions/api/dial/dial_registry.h index 9be88f4..f15628d 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.h +++ b/chrome/browser/extensions/api/dial/dial_registry.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc index 03cc5a9..64a5b5a 100644 --- a/chrome/browser/extensions/api/socket/socket_api.cc +++ b/chrome/browser/extensions/api/socket/socket_api.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/bind.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" #include "chrome/browser/extensions/api/socket/socket.h" diff --git a/chrome/browser/extensions/event_router.h b/chrome/browser/extensions/event_router.h index 8776be1..ad8b72b 100644 --- a/chrome/browser/extensions/event_router.h +++ b/chrome/browser/extensions/event_router.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extensions_quota_service.h b/chrome/browser/extensions/extensions_quota_service.h index 5c3ce42..e29300e 100644 --- a/chrome/browser/extensions/extensions_quota_service.h +++ b/chrome/browser/extensions/extensions_quota_service.h @@ -19,7 +19,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h index b87de29..dc13360 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/chrome/browser/favicon/favicon_service.h @@ -8,7 +8,7 @@ #include <vector> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/favicon/favicon_types.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index 4406cdf..5350751 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -7,7 +7,7 @@ #include <utility> #include "base/bind.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_vector.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/content_settings/host_content_settings_map.h" diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h index 7cc8644..8db9fcb 100644 --- a/chrome/browser/history/android/android_provider_backend.h +++ b/chrome/browser/history/android/android_provider_backend.h @@ -7,9 +7,9 @@ #include <set> +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/android/android_cache_database.h" diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.cc b/chrome/browser/managed_mode/managed_mode_url_filter.cc index e63a791..85be975 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.cc +++ b/chrome/browser/managed_mode/managed_mode_url_filter.cc @@ -4,8 +4,8 @@ #include "chrome/browser/managed_mode/managed_mode_url_filter.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram.h" #include "base/sha1.h" diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h index c1d6f7eb..1de9c97 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h @@ -9,8 +9,8 @@ #include <map> #include <vector> +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" diff --git a/chrome/browser/net/load_time_stats.h b/chrome/browser/net/load_time_stats.h index 961a382..958e922 100644 --- a/chrome/browser/net/load_time_stats.h +++ b/chrome/browser/net/load_time_stats.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/time.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h index 9f7f2b2..1431a61 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.h +++ b/chrome/browser/parsers/metadata_parser_filebase.h @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "chrome/browser/parsers/metadata_parser.h" typedef base::hash_map<std::string, std::string> PropertyMap; diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index 74c1f7a..2ef01d4 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -9,8 +9,8 @@ #include <set> #include <vector> +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/policy/url_blacklist_manager.h b/chrome/browser/policy/url_blacklist_manager.h index de18851..c9bb522 100644 --- a/chrome/browser/policy/url_blacklist_manager.h +++ b/chrome/browser/policy/url_blacklist_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #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/prefs/pref_change_registrar.h" diff --git a/chrome/browser/predictors/logged_in_predictor_table.h b/chrome/browser/predictors/logged_in_predictor_table.h index bb14a40..9cdbd15 100644 --- a/chrome/browser/predictors/logged_in_predictor_table.h +++ b/chrome/browser/predictors/logged_in_predictor_table.h @@ -7,7 +7,7 @@ #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/time.h" #include "chrome/browser/predictors/predictor_table_base.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/prerender/prerender_local_predictor.h b/chrome/browser/prerender/prerender_local_predictor.h index 5bbbee2..b4098bb 100644 --- a/chrome/browser/prerender/prerender_local_predictor.h +++ b/chrome/browser/prerender/prerender_local_predictor.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/timer.h" #include "chrome/browser/common/cancelable_request.h" diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index 6a9be4e..9cbba47 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -11,8 +11,8 @@ #include <utility> #include <vector> +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index 72db359..2a40135 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index a94076c..d811021 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "chrome/browser/net/pref_proxy_config_tracker.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h index b2eb4d0d..bce32a9 100644 --- a/chrome/browser/profiles/profile_impl_io_data.h +++ b/chrome/browser/profiles/profile_impl_io_data.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/profiles/profile_io_data.h" diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index 63869b0..21f4033 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -11,9 +11,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/profiles/storage_partition_descriptor.h b/chrome/browser/profiles/storage_partition_descriptor.h index 39bc769..3613199 100644 --- a/chrome/browser/profiles/storage_partition_descriptor.h +++ b/chrome/browser/profiles/storage_partition_descriptor.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ #define CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" // This structure combines a StoragePartition's on-disk path and a boolean for // whether the partition should be persisted on disk. Its purpose is to serve as diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index 6fcfc13b..ef6c888 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -6,7 +6,7 @@ #include <utility> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "grit/theme_resources_map.h" #include "grit/ui_resources_map.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h index 9a4ba3b..6ea8bf1 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.h +++ b/chrome/browser/safe_browsing/browser_feature_extractor.h @@ -18,7 +18,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/sequenced_task_runner_helpers.h" #include "base/time.h" diff --git a/chrome/browser/safe_browsing/database_manager.h b/chrome/browser/safe_browsing/database_manager.h index ad1dd1e..5e9520f 100644 --- a/chrome/browser/safe_browsing/database_manager.h +++ b/chrome/browser/safe_browsing/database_manager.h @@ -15,7 +15,7 @@ #include <vector> #include "base/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/synchronization/lock.h" diff --git a/chrome/browser/safe_browsing/malware_details.h b/chrome/browser/safe_browsing/malware_details.h index 840288f..b324aed 100644 --- a/chrome/browser/safe_browsing/malware_details.h +++ b/chrome/browser/safe_browsing/malware_details.h @@ -14,8 +14,8 @@ #include <string> #include <vector> +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/malware_details_cache.h b/chrome/browser/safe_browsing/malware_details_cache.h index 4c9a82a..854ed0c 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.h +++ b/chrome/browser/safe_browsing/malware_details_cache.h @@ -12,7 +12,7 @@ #include <vector> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/report.pb.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h index 4665d02..feea944 100644 --- a/chrome/browser/safe_browsing/malware_details_history.h +++ b/chrome/browser/safe_browsing/malware_details_history.h @@ -11,7 +11,7 @@ #include <vector> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 53428e1..9fa2d95 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -18,15 +18,15 @@ #include <string> #include <vector> +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" #include "chrome/browser/safe_browsing/chunk_range.h" -#include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/protocol_manager_helper.h" +#include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index 95b3761..196f6c1 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics.h b/chrome/browser/spellchecker/spellcheck_host_metrics.h index 78f0394..bc36792 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics.h +++ b/chrome/browser/spellchecker/spellcheck_host_metrics.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index 2bea026..ae4e9fb 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.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 "base/location.h" #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/ui/ash/event_rewriter.h b/chrome/browser/ui/ash/event_rewriter.h index 5c8b3d8..f6add25 100644 --- a/chrome/browser/ui/ash/event_rewriter.h +++ b/chrome/browser/ui/ash/event_rewriter.h @@ -11,7 +11,7 @@ #include "ash/event_rewriter_delegate.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "ui/aura/root_window_observer.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/gtk/accelerators_gtk.h b/chrome/browser/ui/gtk/accelerators_gtk.h index 3a57dbf..3bb2153 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.h +++ b/chrome/browser/ui/gtk/accelerators_gtk.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_GTK_ACCELERATORS_GTK_H_ #define CHROME_BROWSER_UI_GTK_ACCELERATORS_GTK_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "ui/base/accelerators/accelerator.h" template <typename T> struct DefaultSingletonTraits; diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 9f179f4..752901b 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" diff --git a/chrome/common/cancelable_task_tracker.h b/chrome/common/cancelable_task_tracker.h index 5d69245..2776d02 100644 --- a/chrome/common/cancelable_task_tracker.h +++ b/chrome/common/cancelable_task_tracker.h @@ -36,7 +36,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index ed7d94e..61f0013 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -13,8 +13,8 @@ #include <utility> #include <vector> +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/message_bundle.cc b/chrome/common/extensions/message_bundle.cc index 9a6481d..aa3310e 100644 --- a/chrome/common/extensions/message_bundle.cc +++ b/chrome/common/extensions/message_bundle.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/common/startup_metric_utils.cc b/chrome/common/startup_metric_utils.cc index 64f63403..f73eaed 100644 --- a/chrome/common/startup_metric_utils.cc +++ b/chrome/common/startup_metric_utils.cc @@ -4,7 +4,7 @@ #include "chrome/common/startup_metric_utils.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_base.h" diff --git a/chrome/renderer/safe_browsing/features.h b/chrome/renderer/safe_browsing/features.h index 1cdb163..1a1888d 100644 --- a/chrome/renderer/safe_browsing/features.h +++ b/chrome/renderer/safe_browsing/features.h @@ -27,7 +27,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" namespace safe_browsing { diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc index 7dd2ef7..f37b1a3 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" @@ -16,11 +16,11 @@ #include "chrome/renderer/safe_browsing/features.h" #include "content/public/renderer/render_view.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeCollection.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/platform/WebString.h" namespace safe_browsing { diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h index dbca5de..0b8478f 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h @@ -20,8 +20,8 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "base/containers/hash_tables.h" #include "base/containers/mru_cache.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc index fe823a1..b348d29 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/strings/string16.h" diff --git a/chrome/renderer/safe_browsing/scorer.h b/chrome/renderer/safe_browsing/scorer.h index 49513f0..b707562 100644 --- a/chrome/renderer/safe_browsing/scorer.h +++ b/chrome/renderer/safe_browsing/scorer.h @@ -17,7 +17,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/strings/string_piece.h" #include "chrome/common/safe_browsing/client_model.pb.h" diff --git a/chrome/renderer/safe_browsing/scorer_unittest.cc b/chrome/renderer/safe_browsing/scorer_unittest.cc index 4e6cc05..3cba2ab 100644 --- a/chrome/renderer/safe_browsing/scorer_unittest.cc +++ b/chrome/renderer/safe_browsing/scorer_unittest.cc @@ -4,10 +4,10 @@ #include "chrome/renderer/safe_browsing/scorer.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/threading/thread.h" diff --git a/chrome/renderer/tts_dispatcher.h b/chrome/renderer/tts_dispatcher.h index 9cf3ceb..397ba64 100644 --- a/chrome/renderer/tts_dispatcher.h +++ b/chrome/renderer/tts_dispatcher.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "content/public/renderer/render_process_observer.h" #include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h" #include "third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h" diff --git a/chrome/tools/ipclist/ipcfuzz.cc b/chrome/tools/ipclist/ipcfuzz.cc index ae00a74..32fd271 100644 --- a/chrome/tools/ipclist/ipcfuzz.cc +++ b/chrome/tools/ipclist/ipcfuzz.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/command_line.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop.h" diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc index 971d707..5f2182e 100644 --- a/chromeos/cryptohome/async_method_caller.cc +++ b/chromeos/cryptohome/async_method_caller.cc @@ -5,7 +5,7 @@ #include "chromeos/cryptohome/async_method_caller.h" #include "base/bind.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" #include "chromeos/dbus/cryptohome_client.h" diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h index ec1df1b..356f976 100644 --- a/content/browser/accessibility/browser_accessibility_manager.h +++ b/content/browser/accessibility/browser_accessibility_manager.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "content/common/accessibility_node_data.h" diff --git a/content/browser/browsing_instance.h b/content/browser/browsing_instance.h index 7a4b1a6..60aa47b 100644 --- a/content/browser/browsing_instance.h +++ b/content/browser/browsing_instance.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BROWSING_INSTANCE_H_ #define CONTENT_BROWSER_BROWSING_INSTANCE_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" diff --git a/content/browser/devtools/devtools_netlog_observer.h b/content/browser/devtools/devtools_netlog_observer.h index 4e74edd..8031c8b 100644 --- a/content/browser/devtools/devtools_netlog_observer.h +++ b/content/browser/devtools/devtools_netlog_observer.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "net/base/net_log.h" #include "webkit/glue/resource_loader_bridge.h" diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h index b75d337..486e69c 100644 --- a/content/browser/download/download_manager_impl.h +++ b/content/browser/download/download_manager_impl.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#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" diff --git a/content/browser/download/save_file_manager.h b/content/browser/download/save_file_manager.h index 8e3523e..0a49b6c 100644 --- a/content/browser/download/save_file_manager.h +++ b/content/browser/download/save_file_manager.h @@ -61,7 +61,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "content/browser/download/save_types.h" #include "content/common/content_export.h" diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h index 222a011..55b0aa2 100644 --- a/content/browser/download/save_package.h +++ b/content/browser/download/save_package.h @@ -11,9 +11,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time.h" diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index 85b8700..8b66213 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -10,8 +10,8 @@ #include <string> #include "base/callback.h" +#include "base/containers/hash_tables.h" #include "base/files/file_util_proxy.h" -#include "base/hash_tables.h" #include "base/id_map.h" #include "base/platform_file.h" #include "base/shared_memory.h" diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index 89103d7..6fa64d6 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -11,7 +11,7 @@ #include <string> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc index 2aad287..57444ac 100644 --- a/content/browser/loader/async_resource_handler.cc +++ b/content/browser/loader/async_resource_handler.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/command_line.h" +#include "base/containers/hash_tables.h" #include "base/debug/alias.h" -#include "base/hash_tables.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/process_util.h" diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h index 6ed0438..01fa665 100644 --- a/content/browser/renderer_host/database_message_filter.h +++ b/content/browser/renderer_host/database_message_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_DATABASE_MESSAGE_FILTER_H_ #define CONTENT_BROWSER_RENDERER_HOST_DATABASE_MESSAGE_FILTER_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/strings/string16.h" #include "content/public/browser/browser_message_filter.h" #include "webkit/browser/database/database_tracker.h" diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h index 5f9bd898..917c953 100644 --- a/content/browser/renderer_host/render_widget_helper.h +++ b/content/browser/renderer_host/render_widget_helper.h @@ -9,7 +9,7 @@ #include <map> #include "base/atomic_sequence_num.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/process.h" #include "base/synchronization/lock.h" diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h index 5ff991c..9ba16b3 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h +++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h" diff --git a/content/browser/storage_partition_impl_map.h b/content/browser/storage_partition_impl_map.h index 7f69dea..972335a 100644 --- a/content/browser/storage_partition_impl_map.h +++ b/content/browser/storage_partition_impl_map.h @@ -9,8 +9,8 @@ #include <string> #include "base/callback_forward.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/supports_user_data.h" #include "content/browser/storage_partition_impl.h" #include "content/public/browser/browser_context.h" diff --git a/content/child/np_channel_base.cc b/content/child/np_channel_base.cc index f84979e..81b848b 100644 --- a/content/child/np_channel_base.cc +++ b/content/child/np_channel_base.cc @@ -7,7 +7,7 @@ #include <stack> #include "base/auto_reset.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" #include "ipc/ipc_sync_message.h" diff --git a/content/child/np_channel_base.h b/content/child/np_channel_base.h index 02ada3e..06e9991 100644 --- a/content/child/np_channel_base.h +++ b/content/child/np_channel_base.h @@ -8,7 +8,7 @@ #include <string> #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/process.h" diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h index 64843e4..1e8f901 100644 --- a/content/child/resource_dispatcher.h +++ b/content/child/resource_dispatcher.h @@ -10,7 +10,7 @@ #include <deque> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/shared_memory.h" diff --git a/content/common/accessibility_node_data.cc b/content/common/accessibility_node_data.cc index 136e02c..ae66f3c 100644 --- a/content/common/accessibility_node_data.cc +++ b/content/common/accessibility_node_data.cc @@ -6,7 +6,7 @@ #include <set> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/content/common/content_ipc_logging.cc b/content/common/content_ipc_logging.cc index 594345d..682c422 100644 --- a/content/common/content_ipc_logging.cc +++ b/content/common/content_ipc_logging.cc @@ -14,7 +14,7 @@ #if defined(IPC_MESSAGE_LOG_ENABLED) -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" namespace content { diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h index 75a0fa4..7d04fdd 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.h +++ b/content/common/gpu/client/command_buffer_proxy_impl.h @@ -13,7 +13,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/weak_ptr.h" #include "base/observer_list.h" diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index c9d73a6..12c1ecf 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -9,7 +9,7 @@ #include <vector> #include "base/atomic_sequence_num.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" diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h index 80b384a..f01a1c5 100644 --- a/content/common/gpu/gpu_channel_manager.h +++ b/content/common/gpu/gpu_channel_manager.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#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" diff --git a/content/common/gpu/gpu_memory_manager.h b/content/common/gpu/gpu_memory_manager.h index 57c2c16..caaead5 100644 --- a/content/common/gpu/gpu_memory_manager.h +++ b/content/common/gpu/gpu_memory_manager.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/cancelable_callback.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/common/gpu/gpu_memory_allocation.h" diff --git a/content/common/gpu/sync_point_manager.h b/content/common/gpu/sync_point_manager.h index ea33ff3..04591828 100644 --- a/content/common/gpu/sync_point_manager.h +++ b/content/common/gpu/sync_point_manager.h @@ -8,7 +8,7 @@ #include <vector> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h index b0d88df..557b4fb7 100644 --- a/content/common/sandbox_mac.h +++ b/content/common/sandbox_mac.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" #include "content/common/content_export.h" #include "content/public/common/sandbox_type_mac.h" diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 307e373..f847a64 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -7,7 +7,7 @@ #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #if defined(OS_MACOSX) #include "base/mac/scoped_cftyperef.h" diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h index 6d5cf73..67ede4a 100644 --- a/content/public/browser/browser_context.h +++ b/content/public/browser/browser_context.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_ #include "base/callback_forward.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" #include "content/common/content_export.h" diff --git a/content/public/browser/download_id.h b/content/public/browser/download_id.h index 0cde6e9..29d1e99 100644 --- a/content/public/browser/download_id.h +++ b/content/public/browser/download_id.h @@ -8,7 +8,7 @@ #include <iosfwd> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/stringprintf.h" #include "content/common/content_export.h" diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 3767641..5131c7a 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -8,10 +8,10 @@ #include <vector> #include "base/command_line.h" +#include "base/containers/hash_tables.h" #include "base/environment.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/hash_tables.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h index 7fff8c248..979c4b0 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.h +++ b/content/renderer/accessibility/renderer_accessibility_complete.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/weak_ptr.h" #include "content/common/accessibility_node_data.h" #include "content/public/renderer/render_view_observer.h" diff --git a/content/renderer/active_notification_tracker.h b/content/renderer/active_notification_tracker.h index d201052..68e022d 100644 --- a/content/renderer/active_notification_tracker.h +++ b/content/renderer/active_notification_tracker.h @@ -8,8 +8,8 @@ #include <map> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/id_map.h" -#include "base/hash_tables.h" #include "content/common/content_export.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 53a457f..568e1c9 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -5,9 +5,9 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.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/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" @@ -20,11 +20,6 @@ #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/public/platform/WebCString.h" -#include "third_party/WebKit/public/platform/WebData.h" -#include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -34,6 +29,11 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "webkit/base/file_path_string_conversions.h" using WebKit::WebCString; diff --git a/content/renderer/gpu/input_handler_proxy.h b/content/renderer/gpu/input_handler_proxy.h index 26a42f5..5331bf9 100644 --- a/content/renderer/gpu/input_handler_proxy.h +++ b/content/renderer/gpu/input_handler_proxy.h @@ -6,14 +6,14 @@ #define CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "cc/input/input_handler.h" #include "content/common/content_export.h" -#include "third_party/WebKit/public/platform/WebGestureCurve.h" -#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" namespace content { diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h index bf5feb4..bf2a861 100644 --- a/content/renderer/plugin_channel_host.h +++ b/content/renderer/plugin_channel_host.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_ #define CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "content/child/np_channel_base.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index f39d2ae..8501a70 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.h @@ -23,7 +23,7 @@ #include "webkit/plugins/webplugininfo.h" #if defined(OS_MACOSX) -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #endif diff --git a/content/renderer/websharedworkerrepository_impl.h b/content/renderer/websharedworkerrepository_impl.h index 4263c8e..c8fe659 100644 --- a/content/renderer/websharedworkerrepository_impl.h +++ b/content/renderer/websharedworkerrepository_impl.h @@ -5,10 +5,9 @@ #ifndef CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_ #define CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_ +#include "base/containers/hash_tables.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" -#include "base/hash_tables.h" - namespace WebKit { class WebSharedWorker; } diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h index a093855..d9e515a 100644 --- a/content/zygote/zygote_linux.h +++ b/content/zygote/zygote_linux.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/process.h" class Pickle; diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 750c36d..7d01722 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -16,8 +16,8 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" diff --git a/courgette/difference_estimator.cc b/courgette/difference_estimator.cc index e591f9b..3b2cddc 100644 --- a/courgette/difference_estimator.cc +++ b/courgette/difference_estimator.cc @@ -8,7 +8,7 @@ #include "courgette/difference_estimator.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" namespace courgette { diff --git a/device/bluetooth/bluetooth_adapter_mac.h b/device/bluetooth/bluetooth_adapter_mac.h index 0886076..7054acf 100644 --- a/device/bluetooth/bluetooth_adapter_mac.h +++ b/device/bluetooth/bluetooth_adapter_mac.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 00d6737..ac2127b 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -4,22 +4,22 @@ #include "device/bluetooth/bluetooth_adapter_mac.h" -#import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h> #import <IOBluetooth/objc/IOBluetoothDevice.h> +#import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h> #import <IOBluetooth/objc/IOBluetoothHostController.h> #include <string> #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" +#include "base/strings/sys_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/time.h" -#include "base/strings/sys_string_conversions.h" #include "device/bluetooth/bluetooth_device_mac.h" // Replicate specific 10.7 SDK declarations for building with prior SDKs. diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h index 9b0ac4a..a017e29 100644 --- a/device/bluetooth/bluetooth_adapter_win.h +++ b/device/bluetooth/bluetooth_adapter_win.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/gpu/command_buffer/client/hash_tables.h b/gpu/command_buffer/client/hash_tables.h index 33872bd..fff3098 100644 --- a/gpu/command_buffer/client/hash_tables.h +++ b/gpu/command_buffer/client/hash_tables.h @@ -13,7 +13,7 @@ struct hash_map : public std::tr1::unordered_map<key, value> { }; } #else -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" namespace gpu { template <typename key, typename value> struct hash_map : public base::hash_map<key, value> { diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager.h b/gpu/command_buffer/service/async_pixel_transfer_manager.h index 6ae71ef..9dc9c67 100644 --- a/gpu/command_buffer/service/async_pixel_transfer_manager.h +++ b/gpu/command_buffer/service/async_pixel_transfer_manager.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 "base/memory/ref_counted.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/gpu_export.h" diff --git a/gpu/command_buffer/service/buffer_manager.h b/gpu/command_buffer/service/buffer_manager.h index 2e54eaeb..313ced6 100644 --- a/gpu/command_buffer/service/buffer_manager.h +++ b/gpu/command_buffer/service/buffer_manager.h @@ -7,7 +7,7 @@ #include <map> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/gpu/command_buffer/service/context_group.h b/gpu/command_buffer/service/context_group.h index c77ce1f..a8edaf0 100644 --- a/gpu/command_buffer/service/context_group.h +++ b/gpu/command_buffer/service/context_group.h @@ -8,14 +8,14 @@ #include <string> #include <vector> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" -#include "gpu/command_buffer/service/gles2_cmd_validation.h" #include "gpu/command_buffer/service/feature_info.h" +#include "gpu/command_buffer/service/gles2_cmd_validation.h" #include "gpu/gpu_export.h" namespace gpu { diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h index 95b6f90..3754a3c 100644 --- a/gpu/command_buffer/service/feature_info.h +++ b/gpu/command_buffer/service/feature_info.h @@ -7,7 +7,7 @@ #include <set> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/sys_info.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" diff --git a/gpu/command_buffer/service/framebuffer_manager.h b/gpu/command_buffer/service/framebuffer_manager.h index eb6125d..ef0a8f4 100644 --- a/gpu/command_buffer/service/framebuffer_manager.h +++ b/gpu/command_buffer/service/framebuffer_manager.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_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 "gpu/command_buffer/service/gl_utils.h" diff --git a/gpu/command_buffer/service/id_manager.h b/gpu/command_buffer/service/id_manager.h index bffbc94..0bc0674 100644 --- a/gpu/command_buffer/service/id_manager.h +++ b/gpu/command_buffer/service/id_manager.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_ID_MANAGER_H_ #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "gpu/command_buffer/service/gl_utils.h" #include "gpu/gpu_export.h" diff --git a/gpu/command_buffer/service/image_manager.h b/gpu/command_buffer/service/image_manager.h index 06a02bc..1b42146 100644 --- a/gpu/command_buffer/service/image_manager.h +++ b/gpu/command_buffer/service/image_manager.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_IMAGE_MANAGER_H_ #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "gpu/gpu_export.h" diff --git a/gpu/command_buffer/service/memory_program_cache.h b/gpu/command_buffer/service/memory_program_cache.h index ed791a8..1f2e53a 100644 --- a/gpu/command_buffer/service/memory_program_cache.h +++ b/gpu/command_buffer/service/memory_program_cache.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" diff --git a/gpu/command_buffer/service/program_cache.h b/gpu/command_buffer/service/program_cache.h index c42d359..9b28dd8 100644 --- a/gpu/command_buffer/service/program_cache.h +++ b/gpu/command_buffer/service/program_cache.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/sha1.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" diff --git a/gpu/command_buffer/service/program_cache_lru_helper.h b/gpu/command_buffer/service/program_cache_lru_helper.h index 8560305..766704c 100644 --- a/gpu/command_buffer/service/program_cache_lru_helper.h +++ b/gpu/command_buffer/service/program_cache_lru_helper.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "gpu/gpu_export.h" namespace gpu { diff --git a/gpu/command_buffer/service/query_manager.h b/gpu/command_buffer/service/query_manager.h index c13221f..3a16da4 100644 --- a/gpu/command_buffer/service/query_manager.h +++ b/gpu/command_buffer/service/query_manager.h @@ -7,7 +7,7 @@ #include <deque> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/gpu/command_buffer/service/renderbuffer_manager.h b/gpu/command_buffer/service/renderbuffer_manager.h index 6283f23..73fc2cb 100644 --- a/gpu/command_buffer/service/renderbuffer_manager.h +++ b/gpu/command_buffer/service/renderbuffer_manager.h @@ -7,7 +7,7 @@ #include <string> #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 "gpu/command_buffer/service/gl_utils.h" diff --git a/gpu/command_buffer/service/shader_manager.h b/gpu/command_buffer/service/shader_manager.h index 68652cf..31d5572 100644 --- a/gpu/command_buffer/service/shader_manager.h +++ b/gpu/command_buffer/service/shader_manager.h @@ -7,7 +7,7 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h index 5904f73..32097e2 100644 --- a/gpu/command_buffer/service/shader_translator.h +++ b/gpu/command_buffer/service/shader_translator.h @@ -8,7 +8,7 @@ #include <string> #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" diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h index c382056..c39479c 100644 --- a/gpu/command_buffer/service/texture_manager.h +++ b/gpu/command_buffer/service/texture_manager.h @@ -10,7 +10,7 @@ #include <string> #include <vector> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" diff --git a/gpu/command_buffer/service/transfer_buffer_manager.h b/gpu/command_buffer/service/transfer_buffer_manager.h index b50a5ae..47d5634 100644 --- a/gpu/command_buffer/service/transfer_buffer_manager.h +++ b/gpu/command_buffer/service/transfer_buffer_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/shared_memory.h" #include "gpu/command_buffer/common/command_buffer_shared.h" diff --git a/gpu/command_buffer/service/vertex_array_manager.h b/gpu/command_buffer/service/vertex_array_manager.h index 1a1fc4a..4fc567c 100644 --- a/gpu/command_buffer/service/vertex_array_manager.h +++ b/gpu/command_buffer/service/vertex_array_manager.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_VERTEX_ARRAY_MANAGER_H_ #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h index eaf7024..3e1f182 100644 --- a/gpu/config/gpu_control_list.h +++ b/gpu/config/gpu_control_list.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/ipc/ipc_logging.h b/ipc/ipc_logging.h index dd3652c..071fc70 100644 --- a/ipc/ipc_logging.h +++ b/ipc/ipc_logging.h @@ -11,7 +11,7 @@ #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop.h" diff --git a/media/crypto/aes_decryptor.h b/media/crypto/aes_decryptor.h index 312e29c..b91ccd4 100644 --- a/media/crypto/aes_decryptor.h +++ b/media/crypto/aes_decryptor.h @@ -8,7 +8,7 @@ #include <string> #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/strings/string_piece.h" diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h index ee108c3..16324ab 100644 --- a/net/base/address_tracker_linux.h +++ b/net/base/address_tracker_linux.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/message_loop.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/net/base/linked_hash_map.h b/net/base/linked_hash_map.h index 5c1f9ef..d08b68d 100644 --- a/net/base/linked_hash_map.h +++ b/net/base/linked_hash_map.h @@ -18,7 +18,7 @@ #include <list> #include <utility> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" // This holds a list of pair<Key, Value> items. This list is what gets diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 32f4fdc8..219d2ea 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -7,15 +7,14 @@ #include <map> #include <string> -#include "net/base/mime_util.h" -#include "net/base/platform_mime_util.h" - -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "net/base/mime_util.h" +#include "net/base/platform_mime_util.h" using std::string; diff --git a/net/base/platform_mime_util.h b/net/base/platform_mime_util.h index fdc43aa..726cea4 100644 --- a/net/base/platform_mime_util.h +++ b/net/base/platform_mime_util.h @@ -7,8 +7,8 @@ #include <string> +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" namespace net { diff --git a/net/base/priority_queue.h b/net/base/priority_queue.h index 2da8936..b758ca4 100644 --- a/net/base/priority_queue.h +++ b/net/base/priority_queue.h @@ -14,7 +14,7 @@ #include "net/base/net_export.h" #if !defined(NDEBUG) -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #endif namespace net { diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h index dcdf6e3..07a5f32 100644 --- a/net/disk_cache/backend_impl.h +++ b/net/disk_cache/backend_impl.h @@ -7,8 +7,8 @@ #ifndef NET_DISK_CACHE_BACKEND_IMPL_H_ #define NET_DISK_CACHE_BACKEND_IMPL_H_ +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/timer.h" #include "net/disk_cache/block_files.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/disk_cache/mem_backend_impl.h b/net/disk_cache/mem_backend_impl.h index 6577084..bf15f6e 100644 --- a/net/disk_cache/mem_backend_impl.h +++ b/net/disk_cache/mem_backend_impl.h @@ -8,7 +8,7 @@ #define NET_DISK_CACHE_MEM_BACKEND_IMPL_H__ #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/disk_cache/disk_cache.h" #include "net/disk_cache/mem_rankings.h" diff --git a/net/disk_cache/mem_entry_impl.h b/net/disk_cache/mem_entry_impl.h index ee4cbe4..ef91f6d 100644 --- a/net/disk_cache/mem_entry_impl.h +++ b/net/disk_cache/mem_entry_impl.h @@ -5,8 +5,8 @@ #ifndef NET_DISK_CACHE_MEM_ENTRY_IMPL_H_ #define NET_DISK_CACHE_MEM_ENTRY_IMPL_H_ +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_log.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h index 4d6f0a9..ce98ebc 100644 --- a/net/disk_cache/simple/simple_backend_impl.h +++ b/net/disk_cache/simple/simple_backend_impl.h @@ -10,8 +10,8 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/net/disk_cache/simple/simple_index.h b/net/disk_cache/simple/simple_index.h index ee0896ac..b8f08a3 100644 --- a/net/disk_cache/simple/simple_index.h +++ b/net/disk_cache/simple/simple_index.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/net/disk_cache/simple/simple_index_file.h b/net/disk_cache/simple/simple_index_file.h index 698b917..3fc218a 100644 --- a/net/disk_cache/simple/simple_index_file.h +++ b/net/disk_cache/simple/simple_index_file.h @@ -8,9 +8,9 @@ #include <string> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" diff --git a/net/disk_cache/v3/backend_impl_v3.h b/net/disk_cache/v3/backend_impl_v3.h index 9f0fdce..947e65c 100644 --- a/net/disk_cache/v3/backend_impl_v3.h +++ b/net/disk_cache/v3/backend_impl_v3.h @@ -7,8 +7,8 @@ #ifndef NET_DISK_CACHE_BACKEND_IMPL_H_ #define NET_DISK_CACHE_BACKEND_IMPL_H_ +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/timer.h" #include "net/disk_cache/block_files.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/disk_cache/v3/backend_worker.h b/net/disk_cache/v3/backend_worker.h index c513263..dd0affd 100644 --- a/net/disk_cache/v3/backend_worker.h +++ b/net/disk_cache/v3/backend_worker.h @@ -7,8 +7,8 @@ #ifndef NET_DISK_CACHE_BACKEND_IMPL_H_ #define NET_DISK_CACHE_BACKEND_IMPL_H_ +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/timer.h" #include "net/disk_cache/block_files.h" #include "net/disk_cache/disk_cache.h" diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 8b1f759..6b1d162 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -19,8 +19,8 @@ #include <string> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" -#include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop_proxy.h" diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h index 00b3295..937892f 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.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/ref_counted.h" #include "base/string_piece.h" #include "net/base/net_export.h" diff --git a/net/http/http_server_properties_impl.h b/net/http/http_server_properties_impl.h index 16c6199..182038f 100644 --- a/net/http/http_server_properties_impl.h +++ b/net/http/http_server_properties_impl.h @@ -10,9 +10,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/containers/mru_cache.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" #include "net/base/host_port_pair.h" diff --git a/net/http/http_server_properties_impl_unittest.cc b/net/http/http_server_properties_impl_unittest.cc index 07f271f..d125adc 100644 --- a/net/http/http_server_properties_impl_unittest.cc +++ b/net/http/http_server_properties_impl_unittest.cc @@ -8,7 +8,7 @@ #include <vector> #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/values.h" diff --git a/net/http/mock_http_cache.h b/net/http/mock_http_cache.h index dcf7e3d..11a5a6a 100644 --- a/net/http/mock_http_cache.h +++ b/net/http/mock_http_cache.h @@ -10,7 +10,7 @@ #ifndef NET_HTTP_MOCK_HTTP_CACHE_H_ #define NET_HTTP_MOCK_HTTP_CACHE_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_transaction_unittest.h" diff --git a/net/quic/blocked_list.h b/net/quic/blocked_list.h index b6be96d..3a7f989 100644 --- a/net/quic/blocked_list.h +++ b/net/quic/blocked_list.h @@ -9,7 +9,7 @@ #include <list> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" namespace net { diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h index 2a63ca1..deeb142 100644 --- a/net/quic/quic_client_session.h +++ b/net/quic/quic_client_session.h @@ -12,7 +12,7 @@ #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/base/completion_callback.h" #include "net/quic/quic_connection_logger.h" #include "net/quic/quic_crypto_client_stream.h" diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h index 2aac2409..3f27461 100644 --- a/net/quic/quic_connection.h +++ b/net/quic/quic_connection.h @@ -22,7 +22,7 @@ #include <set> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/base/ip_endpoint.h" #include "net/base/linked_hash_map.h" #include "net/quic/congestion_control/quic_congestion_manager.h" diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc index 6db37c4..5099838 100644 --- a/net/quic/quic_framer.cc +++ b/net/quic/quic_framer.cc @@ -4,7 +4,7 @@ #include "net/quic/quic_framer.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/quic/crypto/quic_decrypter.h" #include "net/quic/crypto/quic_encrypter.h" #include "net/quic/quic_data_reader.h" diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc index fbeb05c..97c0ac6 100644 --- a/net/quic/quic_framer_test.cc +++ b/net/quic/quic_framer_test.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/port.h" diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h index 608c526..5b113b6 100644 --- a/net/quic/quic_protocol.h +++ b/net/quic/quic_protocol.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/strings/string_piece.h" #include "net/base/int128.h" diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h index 5f85dd6..31a05fe 100644 --- a/net/quic/quic_session.h +++ b/net/quic/quic_session.h @@ -10,7 +10,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/base/ip_endpoint.h" #include "net/quic/blocked_list.h" #include "net/quic/quic_connection.h" diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc index 7ad64bf..f9c6a56 100644 --- a/net/quic/quic_session_test.cc +++ b/net/quic/quic_session_test.cc @@ -6,7 +6,7 @@ #include <set> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/quic_connection.h" #include "net/quic/quic_protocol.h" diff --git a/net/spdy/spdy_priority_forest.h b/net/spdy/spdy_priority_forest.h index cc7200d..4f00f56 100644 --- a/net/spdy/spdy_priority_forest.h +++ b/net/spdy/spdy_priority_forest.h @@ -9,7 +9,7 @@ #include <set> #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/rand_util.h" diff --git a/net/tools/flip_server/epoll_server.h b/net/tools/flip_server/epoll_server.h index 7698df08..2fb7c62 100644 --- a/net/tools/flip_server/epoll_server.h +++ b/net/tools/flip_server/epoll_server.h @@ -34,7 +34,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include <sys/epoll.h> diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h index fd351b2..3644e0a 100644 --- a/net/tools/quic/quic_client.h +++ b/net/tools/quic/quic_client.h @@ -11,7 +11,7 @@ #include <string> #include "base/command_line.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "net/base/ip_endpoint.h" #include "net/quic/crypto/crypto_handshake.h" diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h index 8510b6d..521475b38 100644 --- a/net/tools/quic/quic_dispatcher.h +++ b/net/tools/quic/quic_dispatcher.h @@ -10,7 +10,7 @@ #include <list> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "net/base/ip_endpoint.h" #include "net/quic/blocked_list.h" #include "net/quic/quic_blocked_writer_interface.h" diff --git a/net/tools/quic/quic_in_memory_cache.h b/net/tools/quic/quic_in_memory_cache.h index d71826c..600bb19 100644 --- a/net/tools/quic/quic_in_memory_cache.h +++ b/net/tools/quic/quic_in_memory_cache.h @@ -7,7 +7,7 @@ #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/singleton.h" #include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_frame.h" diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h index 87f37a0..ba3ebd6 100644 --- a/net/tools/quic/quic_server_session.h +++ b/net/tools/quic/quic_server_session.h @@ -10,7 +10,7 @@ #include <set> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "net/quic/quic_crypto_server_stream.h" #include "net/quic/quic_protocol.h" diff --git a/net/tools/quic/quic_time_wait_list_manager.cc b/net/tools/quic/quic_time_wait_list_manager.cc index 0b538bd..3bc2d41 100644 --- a/net/tools/quic/quic_time_wait_list_manager.cc +++ b/net/tools/quic/quic_time_wait_list_manager.cc @@ -6,7 +6,7 @@ #include <errno.h> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "net/base/ip_endpoint.h" diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h index cc4d671d..2b07334 100644 --- a/net/tools/quic/quic_time_wait_list_manager.h +++ b/net/tools/quic/quic_time_wait_list_manager.h @@ -10,7 +10,7 @@ #include <deque> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/strings/string_piece.h" #include "net/quic/quic_blocked_writer_interface.h" #include "net/quic/quic_framer.h" diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h index 44dc090e..2859c98 100644 --- a/net/url_request/url_request_filter.h +++ b/net/url_request/url_request_filter.h @@ -23,7 +23,7 @@ #include <string> #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" #include "net/url_request/url_request.h" diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h index 7d6c719..69b8406 100644 --- a/ppapi/proxy/plugin_dispatcher.h +++ b/ppapi/proxy/plugin_dispatcher.h @@ -9,14 +9,14 @@ #include <string> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/process.h" #include "build/build_config.h" #include "ipc/ipc_sync_channel.h" -#include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_rect.h" #include "ppapi/c/ppb_console.h" #include "ppapi/proxy/dispatcher.h" #include "ppapi/shared_impl/ppapi_preferences.h" diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc index f8666ed..770ebd2 100644 --- a/ppapi/proxy/plugin_main_nacl.cc +++ b/ppapi/proxy/plugin_main_nacl.cc @@ -30,7 +30,7 @@ #include "ppapi/shared_impl/ppb_audio_shared.h" #if defined(IPC_MESSAGE_LOG_ENABLED) -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" LogFunctionMap g_log_function_mapping; diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h index 373c907..b5c2c93 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/ppapi/proxy/ppapi_command_buffer_proxy.h @@ -6,11 +6,11 @@ #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ #include "base/callback.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "gpu/command_buffer/common/command_buffer.h" +#include "gpu/ipc/command_buffer_proxy.h" #include "ppapi/proxy/ppapi_proxy_export.h" #include "ppapi/shared_impl/host_resource.h" -#include "gpu/ipc/command_buffer_proxy.h" namespace IPC { class Message; diff --git a/ppapi/proxy/raw_var_data.cc b/ppapi/proxy/raw_var_data.cc index d4ad279..4de51ae 100644 --- a/ppapi/proxy/raw_var_data.cc +++ b/ppapi/proxy/raw_var_data.cc @@ -6,7 +6,7 @@ #include <stack> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/stl_util.h" #include "ipc/ipc_message.h" #include "ppapi/proxy/ppapi_param_traits.h" diff --git a/ppapi/shared_impl/resource_tracker.h b/ppapi/shared_impl/resource_tracker.h index 54e6daf..2ba43b8 100644 --- a/ppapi/shared_impl/resource_tracker.h +++ b/ppapi/shared_impl/resource_tracker.h @@ -8,7 +8,7 @@ #include <set> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/ppapi/shared_impl/unittest_utils.cc b/ppapi/shared_impl/unittest_utils.cc index 2c32b30..f5d064b 100644 --- a/ppapi/shared_impl/unittest_utils.cc +++ b/ppapi/shared_impl/unittest_utils.cc @@ -6,7 +6,7 @@ #include <cmath> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "ppapi/shared_impl/array_var.h" #include "ppapi/shared_impl/dictionary_var.h" diff --git a/ppapi/shared_impl/var_tracker.h b/ppapi/shared_impl/var_tracker.h index e7278a3..efb48de 100644 --- a/ppapi/shared_impl/var_tracker.h +++ b/ppapi/shared_impl/var_tracker.h @@ -8,7 +8,7 @@ #include <vector> #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/shared_memory.h" diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 258ed90..3326a1d 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -4,9 +4,9 @@ #include "printing/pdf_metafile_skia.h" +#include "base/containers/hash_tables.h" #include "base/file_descriptor_posix.h" #include "base/file_util.h" -#include "base/hash_tables.h" #include "base/metrics/histogram.h" #include "base/posix/eintr_wrapper.h" #include "base/safe_numerics.h" diff --git a/remoting/protocol/util.cc b/remoting/protocol/util.cc index 9b4b2bf..e897634 100644 --- a/remoting/protocol/util.cc +++ b/remoting/protocol/util.cc @@ -5,7 +5,7 @@ #include "remoting/protocol/util.h" #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "net/base/io_buffer.h" #include "third_party/libjingle/source/talk/base/byteorder.h" diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h index 66c2a24..e149ae3 100644 --- a/sync/syncable/directory.h +++ b/sync/syncable/directory.h @@ -11,9 +11,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/containers/hash_tables.h" #include "base/file_util.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/util/report_unrecoverable_error_function.h" #include "sync/internal_api/public/util/weak_handle.h" diff --git a/sync/syncable/syncable_id.h b/sync/syncable/syncable_id.h index 9fe4bdc..bbfeb93 100644 --- a/sync/syncable/syncable_id.h +++ b/sync/syncable/syncable_id.h @@ -10,8 +10,8 @@ #include <sstream> #include <string> +#include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" -#include "base/hash_tables.h" #include "sync/base/sync_export.h" class MockConnectionManager; diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 7ae33ea..0f0ca68 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -14,9 +14,9 @@ #include "base/command_line.h" #include "base/compiler_specific.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/logging.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index 55f6795..d405c34 100644 --- a/tools/android/memdump/memdump.cc +++ b/tools/android/memdump/memdump.cc @@ -18,8 +18,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/containers/hash_tables.h" #include "base/file_util.h" -#include "base/hash_tables.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/tools/cygprofile/cygprofile.cc b/tools/cygprofile/cygprofile.cc index 357a903..06e74b8 100644 --- a/tools/cygprofile/cygprofile.cc +++ b/tools/cygprofile/cygprofile.cc @@ -34,7 +34,7 @@ #include <sys/types.h> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/singleton.h" diff --git a/ui/base/events/key_identifier_conversion.cc b/ui/base/events/key_identifier_conversion.cc index 12092b6..ac71c48 100644 --- a/ui/base/events/key_identifier_conversion.cc +++ b/ui/base/events/key_identifier_conversion.cc @@ -8,7 +8,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/ui/base/touch/touch_factory_x11.h b/ui/base/touch/touch_factory_x11.h index af0c632..4c4366c 100644 --- a/ui/base/touch/touch_factory_x11.h +++ b/ui/base/touch/touch_factory_x11.h @@ -9,7 +9,7 @@ #include <map> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/timer.h" #include "ui/base/ui_export.h" diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 908dd66..9762bb6 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -7,7 +7,7 @@ #include <string> -#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/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h index 99c392c..b3ab9b7 100644 --- a/ui/views/accessible_pane_view.h +++ b/ui/views/accessible_pane_view.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ #define UI_VIEWS_ACCESSIBLE_PANE_VIEW_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 "ui/base/accelerators/accelerator.h" diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc index def9a59..78f988a 100644 --- a/ui/views/corewm/compound_event_filter.cc +++ b/ui/views/corewm/compound_event_filter.cc @@ -4,7 +4,7 @@ #include "ui/views/corewm/compound_event_filter.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/drag_drop_client.h" diff --git a/webkit/browser/appcache/appcache_backend_impl.h b/webkit/browser/appcache/appcache_backend_impl.h index 26ad9f3..1b218831 100644 --- a/webkit/browser/appcache/appcache_backend_impl.h +++ b/webkit/browser/appcache/appcache_backend_impl.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_BACKEND_IMPL_H_ #define WEBKIT_BROWSER_APPCACHE_APPCACHE_BACKEND_IMPL_H_ -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "webkit/browser/appcache/appcache_host.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/browser/appcache/appcache_working_set.h b/webkit/browser/appcache/appcache_working_set.h index e156c84..199245d 100644 --- a/webkit/browser/appcache/appcache_working_set.h +++ b/webkit/browser/appcache/appcache_working_set.h @@ -7,7 +7,7 @@ #include <map> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "googleurl/src/gurl.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/browser/appcache/manifest_parser.h b/webkit/browser/appcache/manifest_parser.h index 9bf5d00..ef9e0a6 100644 --- a/webkit/browser/appcache/manifest_parser.h +++ b/webkit/browser/appcache/manifest_parser.h @@ -35,7 +35,7 @@ #include <string> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "webkit/common/appcache/appcache_interfaces.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/browser/appcache/mock_appcache_storage.h b/webkit/browser/appcache/mock_appcache_storage.h index d89ffbe..1b7674b 100644 --- a/webkit/browser/appcache/mock_appcache_storage.h +++ b/webkit/browser/appcache/mock_appcache_storage.h @@ -10,8 +10,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/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "webkit/browser/appcache/appcache.h" diff --git a/webkit/browser/blob/blob_storage_controller.h b/webkit/browser/blob/blob_storage_controller.h index 530f89c..ca4075a 100644 --- a/webkit/browser/blob/blob_storage_controller.h +++ b/webkit/browser/blob/blob_storage_controller.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/process.h" #include "webkit/common/blob/blob_data.h" diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h index 8befe57..5c2cad5 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h @@ -9,7 +9,7 @@ #include <set> #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/plugins/ppapi/host_var_tracker.h b/webkit/plugins/ppapi/host_var_tracker.h index 138920c..70d0d5c 100644 --- a/webkit/plugins/ppapi/host_var_tracker.h +++ b/webkit/plugins/ppapi/host_var_tracker.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_instance.h" diff --git a/webkit/plugins/ppapi/v8_var_converter.cc b/webkit/plugins/ppapi/v8_var_converter.cc index a8952ff..c895ca0 100644 --- a/webkit/plugins/ppapi/v8_var_converter.cc +++ b/webkit/plugins/ppapi/v8_var_converter.cc @@ -8,7 +8,7 @@ #include <stack> #include <string> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ppapi/shared_impl/array_var.h" diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index 0e07e23..b920c23 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -5,9 +5,9 @@ #ifndef WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_ #define WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_ +#include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" #include "base/string16.h" diff --git a/webkit/support/test_shell_webmimeregistry_impl.h b/webkit/support/test_shell_webmimeregistry_impl.h index b6e876d..4ca8263 100644 --- a/webkit/support/test_shell_webmimeregistry_impl.h +++ b/webkit/support/test_shell_webmimeregistry_impl.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "webkit/glue/simple_webmimeregistry_impl.h" class TestShellWebMimeRegistryImpl |