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 /net/http | |
| 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 'net/http')
| -rw-r--r-- | net/http/http_cache_unittest.cc | 4 | ||||
| -rw-r--r-- | net/http/http_transaction_unittest.cc | 6 | ||||
| -rw-r--r-- | net/http/http_transaction_unittest.h | 1 |
3 files changed, 4 insertions, 7 deletions
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_ - |