Replace all instances of <hash_map> with a "base/hash_tabe.h",

which does the right thing based on whatever platform we're
compiling for, along with changing the hardcoded "stdext::",
which is a MSVC++ism to use base::hash_{map,set}.

B=1869
Review URL: http://codereview.chromium.org/1629

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

5 files changed, 6 insertions, 11 deletions

diff --git a/net/disk_cache/mem_backend_impl.h b/net/disk_cache/mem_backend_impl.h
index 74b1d89..7573c90 100644
--- a/net/disk_cache/mem_backend_impl.h
+++ b/net/disk_cache/mem_backend_impl.h
@@ -77,4 +77,3 @@ class MemBackendImpl : public Backend {
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_MEM_BACKEND_IMPL_H__
-
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 2514f56..a503b74 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <windows.h>
 
+#include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
@@ -216,7 +217,7 @@ class MockDiskCache : public disk_cache::Backend {
   void set_fail_requests() { fail_requests_ = true; }
 
  private:
-  typedef stdext::hash_map<std::string, MockDiskEntry*> EntryMap;
+  typedef base::hash_map<std::string, MockDiskEntry*> EntryMap;
   EntryMap entries_;
   int open_count_;
   int create_count_;
@@ -984,4 +985,3 @@ TEST(HttpCache, SimpleGET_SSLError) {
 
   trans->Destroy();
 }
-
diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc
index eb24b93..64deb78 100644
--- a/net/http/http_transaction_unittest.cc
+++ b/net/http/http_transaction_unittest.cc
@@ -6,8 +6,7 @@
 
 #include <windows.h>
 
-#include <hash_map>
-
+#include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
@@ -99,7 +98,7 @@ static const MockTransaction* const kBuiltinMockTransactions[] = {
   &kRangeGET_Transaction
 };
 
-typedef stdext::hash_map<std::string, const MockTransaction*>
+typedef base::hash_map<std::string, const MockTransaction*>
     MockTransactionMap;
 static MockTransactionMap mock_transactions;
 
@@ -156,4 +155,3 @@ int ReadTransaction(net::HttpTransaction* trans, std::string* result) {
   result->swap(content);
   return net::OK;
 }
-
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index ebfef58..6486fa6 100644
--- a/net/http/http_transaction_unittest.h
+++ b/net/http/http_transaction_unittest.h
@@ -319,4 +319,3 @@ class MockNetworkLayer : public net::HttpTransactionFactory {
 int ReadTransaction(net::HttpTransaction* trans, std::string* result);
 
 #endif  // NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_
-
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index 4efea08..1ea92a3 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -19,10 +19,10 @@
 #ifndef NET_URL_REQUEST_URL_REQUEST_FILTER_H_
 #define NET_URL_REQUEST_URL_REQUEST_FILTER_H_
 
-#include <hash_map>
 #include <map>
 #include <string>
 
+#include "base/hash_tables.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
@@ -33,7 +33,7 @@ class URLRequestFilter {
   // scheme,hostname -> ProtocolFactory
   typedef std::map<std::pair<std::string, std::string>,
       URLRequest::ProtocolFactory*> HostnameHandlerMap;
-  typedef stdext::hash_map<std::string, URLRequest::ProtocolFactory*>
+  typedef base::hash_map<std::string, URLRequest::ProtocolFactory*>
       UrlHandlerMap;
 
   // Singleton instance for use.
@@ -78,4 +78,3 @@ class URLRequestFilter {
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_FILTER_H_
-