| 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 b3f5d81d9e78703e88c982d8577a03f6846c7842..5b5ceec8b60c874e87289381523e20e41ba1febc 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| @@ -32,10 +32,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)
|
| @@ -88,7 +88,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));
|
| @@ -105,7 +105,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));
|
|
|