Rename base/hash_tables to base/containers/hash_tables.

Remove forwarding header

BUG=
R=avi@chromium.org

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

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

35 files changed, 37 insertions, 38 deletions

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"