Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/fetch/CachingCorrectnessTest.cpp

 /*
  * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/fetch/FetchContext.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
-#include "core/fetch/ResourcePtr.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 // An URL for the original request.
@@ skipping 22 matching lines @@
     MockFetchContext() { }
 };
 
 class CachingCorrectnessTest : public ::testing::Test {
 protected:
     void advanceClock(double seconds)
     {
         m_proxyPlatform.advanceClock(seconds);
     }
 
-    ResourcePtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)
+    PassRefPtrWillBeRawPtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)
     {
         if (response.url().isNull())
             response.setURL(KURL(ParsedURLString, kResourceURL));
-        ResourcePtr<Resource> resource;
+        RefPtrWillBeRawPtr<Resource> resource = nullptr;
         switch (type) {
         case Resource::Raw:
-            resource = new Resource(ResourceRequest(response.url()), type);
+            resource = Resource::create(ResourceRequest(response.url()), type);
             break;
         case Resource::Image:
-            resource = new ImageResource(ResourceRequest(response.url()), nullptr);
+            resource = ImageResource::create(ResourceRequest(response.url()), nullptr);
             break;
         default:
             EXPECT_TRUE(false) << "'Unreachable' code was reached";
             return nullptr;
         }
         resource->setResponse(response);
         memoryCache()->add(resource.get());
 
         return resource;
     }
 
-    ResourcePtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)
+    PassRefPtrWillBeRawPtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)
     {
         if (request.url().isNull())
             request.setURL(KURL(ParsedURLString, kResourceURL));
-        ResourcePtr<Resource> resource =
-            new Resource(request, type);
+        RefPtrWillBeRawPtr<Resource> resource =
+            Resource::create(request, type);
         resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));
         memoryCache()->add(resource.get());
 
         return resource;
     }
 
-    ResourcePtr<Resource> fetch()
+    PassRefPtrWillBeRawPtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
         return RawResource::fetchSynchronously(fetchRequest, fetcher());
     }
 
-    ResourcePtr<Resource> fetchImage()
+    PassRefPtrWillBeRawPtr<Resource> fetchImage()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
         return ImageResource::fetch(fetchRequest, fetcher());
     }
 
     ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
 private:
     // A simple platform that mocks out the clock, for cache freshness testing.
     class ProxyPlatform : public TestingPlatformSupport {
@@ skipping 37 matching lines @@
     Persistent<ResourceFetcher> m_fetcher;
 };
 
 TEST_F(CachingCorrectnessTest, FreshFromLastModified)
 {
     ResourceResponse fresh200Response;
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRequest);
 
-    ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
+    RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
 
     // Advance the clock within the implicit freshness period of this resource before we make a request.
     advanceClock(600.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(fresh200, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshFromExpires)
 {
     ResourceResponse fresh200Response;
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
 
-    ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
+    RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
 
     // Advance the clock within the freshness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. - 15.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(fresh200, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshFromMaxAge)
 {
     ResourceResponse fresh200Response;
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField("Cache-Control", "max-age=600");
 
-    ResourcePtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
+    RefPtrWillBeRawPtr<Resource> fresh200 = resourceFromResourceResponse(fresh200Response);
 
     // Advance the clock within the freshness period of this resource before we make a request.
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(fresh200, fetched);
 }
 
 // The strong validator causes a revalidation to be launched, and the proxy and original resources leak because of their reference loop.
 TEST_F(CachingCorrectnessTest, DISABLED_ExpiredFromLastModified)
 {
     ResourceResponse expired200Response;
     expired200Response.setHTTPStatusCode(200);
     expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     expired200Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRequest);
 
-    ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
+    RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
 
     // Advance the clock beyond the implicit freshness period.
     advanceClock(24. * 60. * 60. * 0.2);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(expired200, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, ExpiredFromExpires)
 {
     ResourceResponse expired200Response;
     expired200Response.setHTTPStatusCode(200);
     expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
 
-    ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
+    RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
 
     // Advance the clock within the expiredness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. + 15.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(expired200, fetched);
 }
 
 // If the image hasn't been loaded in this "document" before, then it shouldn't have list of available images logic.
 TEST_F(CachingCorrectnessTest, NewImageExpiredFromExpires)
 {
     ResourceResponse expired200Response;
     expired200Response.setHTTPStatusCode(200);
     expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
 
-    ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);
+    RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);
 
     // Advance the clock within the expiredness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. + 15.);
 
-    ResourcePtr<Resource> fetched = fetchImage();
+    RefPtrWillBeRawPtr<Resource> fetched = fetchImage();
     EXPECT_NE(expired200, fetched);
 }
 
 // If the image has been loaded in this "document" before, then it should have list of available images logic, and so
 // normal cache testing should be bypassed.
 TEST_F(CachingCorrectnessTest, ReuseImageExpiredFromExpires)
 {
     ResourceResponse expired200Response;
     expired200Response.setHTTPStatusCode(200);
     expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     expired200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
 
-    ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);
+    RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response, Resource::Image);
 
     // Advance the clock within the freshness period, and make a request to add this image to the document resources.
     advanceClock(15.);
-    ResourcePtr<Resource> firstFetched = fetchImage();
+    RefPtrWillBeRawPtr<Resource> firstFetched = fetchImage();
     EXPECT_EQ(expired200, firstFetched);
 
     // Advance the clock within the expiredness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. + 15.);
 
-    ResourcePtr<Resource> fetched = fetchImage();
+    RefPtrWillBeRawPtr<Resource> fetched = fetchImage();
     EXPECT_EQ(expired200, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, ExpiredFromMaxAge)
 {
     ResourceResponse expired200Response;
     expired200Response.setHTTPStatusCode(200);
     expired200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
     expired200Response.setHTTPHeaderField("Cache-Control", "max-age=600");
 
-    ResourcePtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
+    RefPtrWillBeRawPtr<Resource> expired200 = resourceFromResourceResponse(expired200Response);
 
     // Advance the clock within the expiredness period of this resource before we make a request.
     advanceClock(700.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(expired200, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshButNoCache)
 {
     ResourceResponse fresh200NocacheResponse;
     fresh200NocacheResponse.setHTTPStatusCode(200);
     fresh200NocacheResponse.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200NocacheResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
     fresh200NocacheResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
 
-    ResourcePtr<Resource> fresh200Nocache = resourceFromResourceResponse(fresh200NocacheResponse);
+    RefPtrWillBeRawPtr<Resource> fresh200Nocache = resourceFromResourceResponse(fresh200NocacheResponse);
 
     // Advance the clock within the freshness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. - 15.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(fresh200Nocache, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, RequestWithNoCahe)
 {
     ResourceRequest noCacheRequest;
     noCacheRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
-    ResourcePtr<Resource> noCacheResource = resourceFromResourceRequest(noCacheRequest);
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> noCacheResource = resourceFromResourceRequest(noCacheRequest);
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(noCacheResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshButNoStore)
 {
     ResourceResponse fresh200NostoreResponse;
     fresh200NostoreResponse.setHTTPStatusCode(200);
     fresh200NostoreResponse.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200NostoreResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
     fresh200NostoreResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "no-store");
 
-    ResourcePtr<Resource> fresh200Nostore = resourceFromResourceResponse(fresh200NostoreResponse);
+    RefPtrWillBeRawPtr<Resource> fresh200Nostore = resourceFromResourceResponse(fresh200NostoreResponse);
 
     // Advance the clock within the freshness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. - 15.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(fresh200Nostore, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, RequestWithNoStore)
 {
     ResourceRequest noStoreRequest;
     noStoreRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "no-store");
-    ResourcePtr<Resource> noStoreResource = resourceFromResourceRequest(noStoreRequest);
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> noStoreResource = resourceFromResourceRequest(noStoreRequest);
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(noStoreResource, fetched);
 }
 
 // FIXME: Determine if ignoring must-revalidate for blink is correct behaviour.
 // See crbug.com/340088 .
 TEST_F(CachingCorrectnessTest, DISABLED_FreshButMustRevalidate)
 {
     ResourceResponse fresh200MustRevalidateResponse;
     fresh200MustRevalidateResponse.setHTTPStatusCode(200);
     fresh200MustRevalidateResponse.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200MustRevalidateResponse.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
     fresh200MustRevalidateResponse.setHTTPHeaderField(HTTPNames::Cache_Control, "must-revalidate");
 
-    ResourcePtr<Resource> fresh200MustRevalidate = resourceFromResourceResponse(fresh200MustRevalidateResponse);
+    RefPtrWillBeRawPtr<Resource> fresh200MustRevalidate = resourceFromResourceResponse(fresh200MustRevalidateResponse);
 
     // Advance the clock within the freshness period of this resource before we make a request.
     advanceClock(24. * 60. * 60. - 15.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(fresh200MustRevalidate, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshWithFreshRedirect)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
 
-    ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);
 
     ResourceResponse fresh301Response;
     fresh301Response.setURL(redirectUrl);
     fresh301Response.setHTTPStatusCode(301);
     fresh301Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh301Response.setHTTPHeaderField(HTTPNames::Location, redirectTargetUrlString);
     fresh301Response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=600");
 
     // Add the redirect to our request.
     ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
     firstResource->willFollowRedirect(redirectRequest, fresh301Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, FreshWithStaleRedirect)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
 
-    ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);
 
     ResourceResponse stale301Response;
     stale301Response.setURL(redirectUrl);
     stale301Response.setHTTPStatusCode(301);
     stale301Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     stale301Response.setHTTPHeaderField(HTTPNames::Location, redirectTargetUrlString);
 
     // Add the redirect to our request.
     ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
     firstResource->willFollowRedirect(redirectRequest, stale301Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, PostToSameURLTwice)
 {
     ResourceRequest request1(KURL(ParsedURLString, kResourceURL));
     request1.setHTTPMethod(HTTPNames::POST);
-    ResourcePtr<Resource> resource1 = new Resource(ResourceRequest(request1.url()), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> resource1 = Resource::create(ResourceRequest(request1.url()), Resource::Raw);
     resource1->setLoading(true);
     memoryCache()->add(resource1.get());
 
     ResourceRequest request2(KURL(ParsedURLString, kResourceURL));
     request2.setHTTPMethod(HTTPNames::POST);
     FetchRequest fetch2(request2, FetchInitiatorInfo());
-    ResourcePtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());
+    RefPtrWillBeRawPtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());
 
     EXPECT_EQ(resource2, memoryCache()->resourceForURL(request2.url()));
     EXPECT_NE(resource1, resource2);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
 
-    ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);
 
     ResourceResponse fresh302Response;
     fresh302Response.setURL(redirectUrl);
     fresh302Response.setHTTPStatusCode(302);
     fresh302Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh302Response.setHTTPHeaderField(HTTPNames::Last_Modified, kOneDayBeforeOriginalRequest);
     fresh302Response.setHTTPHeaderField(HTTPNames::Location, redirectTargetUrlString);
 
     // Add the redirect to our request.
     ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshMaxAge)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
 
-    ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);
 
     ResourceResponse fresh302Response;
     fresh302Response.setURL(redirectUrl);
     fresh302Response.setHTTPStatusCode(302);
     fresh302Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh302Response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=600");
     fresh302Response.setHTTPHeaderField(HTTPNames::Location, redirectTargetUrlString);
 
     // Add the redirect to our request.
     ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectExplicitlyFreshExpires)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
 
-    ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectUrl), Resource::Raw);
+    RefPtrWillBeRawPtr<Resource> firstResource = Resource::create(ResourceRequest(redirectUrl), Resource::Raw);
 
     ResourceResponse fresh302Response;
     fresh302Response.setURL(redirectUrl);
     fresh302Response.setHTTPStatusCode(302);
     fresh302Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh302Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
     fresh302Response.setHTTPHeaderField(HTTPNames::Location, redirectTargetUrlString);
 
     // Add the redirect to our request.
     ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
     firstResource->willFollowRedirect(redirectRequest, fresh302Response);
 
     // Add the final response to our request.
     ResourceResponse fresh200Response;
     fresh200Response.setURL(redirectTargetUrl);
     fresh200Response.setHTTPStatusCode(200);
     fresh200Response.setHTTPHeaderField(HTTPNames::Date, kOriginalRequestDateAsString);
     fresh200Response.setHTTPHeaderField(HTTPNames::Expires, kOneDayAfterOriginalRequest);
 
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
-    ResourcePtr<Resource> fetched = fetch();
+    RefPtrWillBeRawPtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace blink