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, 9 insertions, 15 deletions

diff --git a/webkit/glue/dom_serializer.h b/webkit/glue/dom_serializer.h
index 8ea7ce0..bfe8c43 100644
--- a/webkit/glue/dom_serializer.h
+++ b/webkit/glue/dom_serializer.h
@@ -6,8 +6,8 @@
 #define WEBKIT_GLUE_DOM_SERIALIZER_H__
 
 #include <string>
-#include <hash_map>
 
+#include "base/hash_tables.h"
 #include "googleurl/src/gurl.h"
 
 class WebFrame;
@@ -67,7 +67,7 @@ class DomSerializer {
   WebFrameImpl* specified_webframeimpl_;
   // This hash_map is used to map resource URL of original link to its local
   // file path.
-  typedef stdext::hash_map<std::wstring, std::wstring> LinkLocalPathMap;
+  typedef base::hash_map<std::wstring, std::wstring> LinkLocalPathMap;
   // local_links_ include all pair of local resource path and corresponding
   // original link.
   LinkLocalPathMap local_links_;
@@ -169,4 +169,3 @@ class DomSerializer {
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_DOM_SERIALIZER_H__
-
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 9517010..662105e 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <hash_map>
-
 #include "config.h"
 
 #pragma warning(push, 0)
@@ -21,6 +19,7 @@
 #pragma warning(pop)
 #undef LOG
 
+#include "base/hash_tables.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
@@ -148,10 +147,10 @@ class DomSerializerTests : public TestShellTest,
 
  private:
   // Map frame_url to corresponding serialized_content.
-  typedef stdext::hash_map<std::wstring, std::string> SerializedFrameContentMap;
+  typedef base::hash_map<std::wstring, std::string> SerializedFrameContentMap;
   SerializedFrameContentMap serialized_frame_map_;
   // Map frame_url to corresponding status of serialization finish.
-  typedef stdext::hash_map<std::wstring, bool> SerializationFinishStatusMap;
+  typedef base::hash_map<std::wstring, bool> SerializationFinishStatusMap;
   SerializationFinishStatusMap serialization_finish_status_;
   // Flag indicates whether the process of serializing DOM is finished or not.
   bool serialized_;
@@ -675,4 +674,3 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
     webkit_glue::DeprecatedStringToStdWString(doc->baseURL()).c_str());
   ASSERT_TRUE(new_base_url == path_dir_url);
 }
-
diff --git a/webkit/glue/entity_map.cc b/webkit/glue/entity_map.cc
index 77faa34..f61dfa4 100644
--- a/webkit/glue/entity_map.cc
+++ b/webkit/glue/entity_map.cc
@@ -4,15 +4,14 @@
 
 #include "webkit/glue/entity_map.h"
 
-#include <hash_map>
-
 #include "HTMLEntityCodes.c"
 
+#include "base/hash_tables.h"
 #include "base/string_util.h"
 
 namespace webkit_glue {
 
-typedef stdext::hash_map<wchar_t, const char*> EntityMapType;
+typedef base::hash_map<wchar_t, const char*> EntityMapType;
 
 class EntityMapData {
  public:
@@ -91,4 +90,3 @@ const char* EntityMap::GetEntityNameByCode(wchar_t code, bool is_html) {
 }
 
 }  // namespace webkit_glue
-
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
index 912652b..a0a6a82 100644
--- a/webkit/glue/plugins/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -5,10 +5,10 @@
 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_LIB_H__
 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIB_H__
 
-#include <hash_map>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "webkit/glue/plugins/nphostapi.h"
@@ -122,7 +122,7 @@ class PluginLib : public base::RefCounted<PluginLib> {
   int              instance_count_;   // count of plugins in use
 
   // A map of all the insantiated plugins.
-  typedef stdext::hash_map<std::wstring, scoped_refptr<PluginLib> > PluginMap;
+  typedef base::hash_map<std::wstring, scoped_refptr<PluginLib> > PluginMap;
   static PluginMap* loaded_libs_;
 
   // C-style function pointers
@@ -136,4 +136,3 @@ class PluginLib : public base::RefCounted<PluginLib> {
 } // namespace NPAPI
 
 #endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_LIB_H__
-