Index: third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp |
diff --git a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp |
index 267e0d9e67eb2c4cbb72fe02f5cacfe74020f51a..d302bcaf64b31d39e566cf99725661c8677dc1b2 100644 |
--- a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp |
+++ b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp |
@@ -34,16 +34,18 @@ |
#include "platform/network/ResourceResponse.h" |
#include "platform/weborigin/SchemeRegistry.h" |
#include "platform/weborigin/SecurityOrigin.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/Threading.h" |
#include "wtf/text/AtomicString.h" |
#include "wtf/text/StringBuilder.h" |
#include <algorithm> |
+#include <memory> |
namespace blink { |
-static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet() |
+static std::unique_ptr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet() |
{ |
- OwnPtr<HTTPHeaderSet> headerSet = adoptPtr(new HashSet<String, CaseFoldingHash>); |
+ std::unique_ptr<HTTPHeaderSet> headerSet = wrapUnique(new HashSet<String, CaseFoldingHash>); |
headerSet->add("cache-control"); |
headerSet->add("content-language"); |
@@ -57,7 +59,7 @@ static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet() |
bool isOnAccessControlResponseHeaderWhitelist(const String& name) |
{ |
- DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().leakPtr())); |
+ DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().release())); |
return allowedCrossOriginResponseHeaders.contains(name); |
} |