diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 20:51:30 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 20:51:30 +0000 |
commit | 2314403e94e659d586475e59975e9d84d87cbcd3 (patch) | |
tree | b6abf72ec953e61297307a62ad67517c273bdddb /webkit/glue/dom_serializer_unittest.cc | |
parent | e9fe92b3357e9010d14dcf628fe3dd7dad830a20 (diff) | |
download | chromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.zip chromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.tar.gz chromium_src-2314403e94e659d586475e59975e9d84d87cbcd3.tar.bz2 |
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
Diffstat (limited to 'webkit/glue/dom_serializer_unittest.cc')
-rw-r--r-- | webkit/glue/dom_serializer_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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); } - |