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

4 files changed, 8 insertions, 12 deletions

diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 3a6bc74..c107a00 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -11,10 +11,10 @@
 // The SafeBrowsingProtocolParser class to do the actual parsing.
 
 #include <deque>
-#include <hash_map>
 #include <string>
 #include <vector>
 
+#include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/url_fetcher.h"
@@ -166,8 +166,8 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
   std::deque<ChunkUrl> chunk_request_urls_;
 
   // Map of GetHash requests.
-  typedef stdext::hash_map<const URLFetcher*,
-                           SafeBrowsingService::SafeBrowsingCheck*> HashRequests;
+  typedef base::hash_map<const URLFetcher*,
+                         SafeBrowsingService::SafeBrowsingCheck*> HashRequests;
   HashRequests hash_requests_;
 
   // The next scheduled update has special behavior for the first 2 requests.
@@ -205,4 +205,3 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H__
-
diff --git a/chrome/browser/safe_browsing/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
index e171d4c..a6d16d5 100644
--- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
@@ -4,8 +4,7 @@
 //
 // Program to test the SafeBrowsing protocol parsing v2.1.
 
-#include <hash_map>
-
+#include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 4b4fe47..872f76e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
 
-#include <hash_map>
 #include <list>
 #include <queue>
 #include <vector>
 
+#include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "base/time.h"
@@ -288,7 +288,7 @@ class SafeBrowsingDatabase {
   } HashCacheEntry;
 
   typedef std::list<HashCacheEntry> HashList;
-  typedef stdext::hash_map<SBPrefix, HashList> HashCache;
+  typedef base::hash_map<SBPrefix, HashList> HashCache;
   HashCache hash_cache_;
 
   // Cache of prefixes that returned empty results (no full hash match).
@@ -301,4 +301,3 @@ class SafeBrowsingDatabase {
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 6f10b81..478fee4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -9,11 +9,11 @@
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
 
 #include <deque>
-#include <hash_map>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
@@ -220,7 +220,7 @@ class SafeBrowsingService
 
   // Used for issuing only one GetHash request for a given prefix.
   typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
-  typedef stdext::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
+  typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
   GetHashRequests gethash_requests_;
 
   // The sqlite database.  We don't use a scoped_ptr because it needs to be
@@ -254,4 +254,3 @@ class SafeBrowsingService
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
-