Index: Source/core/loader/CrossOriginPreflightResultCache.cpp |
diff --git a/Source/core/loader/CrossOriginPreflightResultCache.cpp b/Source/core/loader/CrossOriginPreflightResultCache.cpp |
index 460e2e9f826d5a73e671a30a6c8662a7c6ff122b..babd969bc692f7b83f717787ab0bbe38355f7bad 100644 |
--- a/Source/core/loader/CrossOriginPreflightResultCache.cpp |
+++ b/Source/core/loader/CrossOriginPreflightResultCache.cpp |
@@ -35,8 +35,6 @@ |
namespace WebCore { |
-using namespace std; |
- |
// These values are at the discretion of the user agent. |
static const unsigned defaultPreflightCacheTimeoutSeconds = 5; |
static const unsigned maxPreflightCacheTimeoutSeconds = 600; // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network. |
@@ -157,13 +155,13 @@ CrossOriginPreflightResultCache& CrossOriginPreflightResultCache::shared() |
void CrossOriginPreflightResultCache::appendEntry(const String& origin, const KURL& url, PassOwnPtr<CrossOriginPreflightResultCacheItem> preflightResult) |
{ |
ASSERT(isMainThread()); |
- m_preflightHashMap.set(make_pair(origin, url), preflightResult); |
+ m_preflightHashMap.set(std::make_pair(origin, url), preflightResult); |
} |
bool CrossOriginPreflightResultCache::canSkipPreflight(const String& origin, const KURL& url, StoredCredentials includeCredentials, const String& method, const HTTPHeaderMap& requestHeaders) |
{ |
ASSERT(isMainThread()); |
- CrossOriginPreflightResultHashMap::iterator cacheIt = m_preflightHashMap.find(make_pair(origin, url)); |
+ CrossOriginPreflightResultHashMap::iterator cacheIt = m_preflightHashMap.find(std::make_pair(origin, url)); |
if (cacheIt == m_preflightHashMap.end()) |
return false; |