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, 6 insertions, 10 deletions

diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc
index bebff70..402075f 100644
--- a/chrome/common/chrome_plugin_lib.cc
+++ b/chrome/common/chrome_plugin_lib.cc
@@ -5,6 +5,7 @@
 #include "chrome/common/chrome_plugin_lib.h"
 
 #include "base/command_line.h"
+#include "base/hash_tables.h"
 #include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
@@ -21,7 +22,7 @@ const TCHAR ChromePluginLib::kRegistryChromePlugins[] =
 static const TCHAR kRegistryLoadOnStartup[] = _T("LoadOnStartup");
 static const TCHAR kRegistryPath[] = _T("Path");
 
-typedef stdext::hash_map<std::wstring, scoped_refptr<ChromePluginLib> >
+typedef base::hash_map<std::wstring, scoped_refptr<ChromePluginLib> >
     PluginMap;
 
 // A map of all the instantiated plugins.
@@ -257,4 +258,3 @@ void ChromePluginLib::Unload() {
     module_ = 0;
   }
 }
-
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index c0c980f..41c672b 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_COMMON_CHROME_PLUGIN_LIB_H_
 #define CHROME_COMMON_CHROME_PLUGIN_LIB_H_
 
-#include <hash_map>
 #include <string>
 
 #include "base/basictypes.h"
@@ -96,4 +95,3 @@ class ChromePluginLib : public base::RefCounted<ChromePluginLib>  {
 };
 
 #endif  // CHROME_COMMON_CHROME_PLUGIN_LIB_H_
-
diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h
index 32c012f..cb81467 100644
--- a/chrome/common/pref_service.h
+++ b/chrome/common/pref_service.h
@@ -15,10 +15,10 @@
 #ifndef CHROME_COMMON_PREF_SERVICE_H_
 #define CHROME_COMMON_PREF_SERVICE_H_
 
-#include <hash_map>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/hash_tables.h"
 #include "base/non_thread_safe.h"
 #include "base/observer_list.h"
 #include "base/scoped_ptr.h"
@@ -230,7 +230,7 @@ class PrefService : public NonThreadSafe {
   // A map from pref names to a list of observers.  Observers get fired in the
   // order they are added.
   typedef ObserverList<NotificationObserver> NotificationObserverList;
-  typedef stdext::hash_map<std::wstring, NotificationObserverList*>
+  typedef base::hash_map<std::wstring, NotificationObserverList*>
       PrefObserverMap;
   PrefObserverMap pref_observers_;
 
@@ -238,4 +238,3 @@ class PrefService : public NonThreadSafe {
 };
 
 #endif  // CHROME_COMMON_PREF_SERVICE_H_
-
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h
index ec3deb3..984aed2 100644
--- a/chrome/common/resource_dispatcher.h
+++ b/chrome/common/resource_dispatcher.h
@@ -8,8 +8,8 @@
 #define CHROME_COMMON_RESOURCE_DISPATCHER_H__
 
 #include <windows.h>
-#include <hash_map>
 
+#include "base/hash_tables.h"
 #include "base/task.h"
 #include "chrome/common/ipc_channel.h"
 #include "chrome/common/render_messages.h"
@@ -91,7 +91,7 @@ class ResourceDispatcher : public base::RefCounted<ResourceDispatcher> {
     bool mixed_content;
     bool is_deferred;
   };
-  typedef stdext::hash_map<int,PendingRequestInfo> PendingRequestList;
+  typedef base::hash_map<int,PendingRequestInfo> PendingRequestList;
 
   // Message response handlers, called by the message handler for this process.
   void OnUploadProgress(int request_id, int64 position, int64 size);
@@ -118,4 +118,3 @@ class ResourceDispatcher : public base::RefCounted<ResourceDispatcher> {
 };
 
 #endif  // CHROME_COMMON_RESOURCE_DISPATCHER_H__
-