| Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| index 5aa882ad4bf2559fd56dd2859430df99dae738f0..e3b12ec73f5306b72b5cbe679ada5d10bf096e2e 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| @@ -31,10 +31,10 @@ protected:
|
| document->setSecurityOrigin(secureOrigin);
|
| }
|
|
|
| - RefPtrWillBePersistent<ContentSecurityPolicy> csp;
|
| + Persistent<ContentSecurityPolicy> csp;
|
| KURL secureURL;
|
| RefPtr<SecurityOrigin> secureOrigin;
|
| - RefPtrWillBePersistent<Document> document;
|
| + Persistent<Document> document;
|
| };
|
|
|
| TEST_F(ContentSecurityPolicyTest, ParseUpgradeInsecureRequestsEnabled)
|
| @@ -65,7 +65,7 @@ TEST_F(ContentSecurityPolicyTest, CopyStateFrom)
|
| KURL exampleUrl(KURL(), "http://example.com");
|
| KURL notExampleUrl(KURL(), "http://not-example.com");
|
|
|
| - RefPtrWillBeRawPtr<ContentSecurityPolicy> csp2 = ContentSecurityPolicy::create();
|
| + RawPtr<ContentSecurityPolicy> csp2 = ContentSecurityPolicy::create();
|
| csp2->copyStateFrom(csp.get());
|
| EXPECT_FALSE(csp2->allowScriptFromSource(exampleUrl, ContentSecurityPolicy::DidNotRedirect, ContentSecurityPolicy::SuppressReport));
|
| EXPECT_TRUE(csp2->allowPluginType("application/x-type-1", "application/x-type-1", exampleUrl, ContentSecurityPolicy::SuppressReport));
|
| @@ -82,7 +82,7 @@ TEST_F(ContentSecurityPolicyTest, CopyPluginTypesFrom)
|
| KURL exampleUrl(KURL(), "http://example.com");
|
| KURL notExampleUrl(KURL(), "http://not-example.com");
|
|
|
| - RefPtrWillBeRawPtr<ContentSecurityPolicy> csp2 = ContentSecurityPolicy::create();
|
| + RawPtr<ContentSecurityPolicy> csp2 = ContentSecurityPolicy::create();
|
| csp2->copyPluginTypesFrom(csp.get());
|
| EXPECT_TRUE(csp2->allowScriptFromSource(exampleUrl, ContentSecurityPolicy::DidNotRedirect, ContentSecurityPolicy::SuppressReport));
|
| EXPECT_TRUE(csp2->allowPluginType("application/x-type-1", "application/x-type-1", exampleUrl, ContentSecurityPolicy::SuppressReport));
|
|
|