Revert of Revalidate using the same Resource, attempt #2

Source/core/fetch/RawResourceTest.cpp

 /*
  * Copyright (c) 2013, 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 42 matching lines @@
     ResourcePtr<RawResource> jpegResource(new RawResource(jpegRequest, Resource::Raw));
 
     ResourceRequest pngRequest;
     pngRequest.setHTTPAccept("image/png");
 
     ASSERT_FALSE(jpegResource->canReuse(pngRequest));
 }
 
 TEST(RawResourceTest, RevalidationSucceeded)
 {
-    ResourcePtr<Resource> resource(new RawResource(ResourceRequest("data:text/html,"), Resource::Raw));
-    ResourceResponse response;
-    response.setHTTPStatusCode(200);
-    resource->responseReceived(response, nullptr);
-    const char data[5] = "abcd";
-    resource->appendData(data, 4);
-    resource->finish();
-    memoryCache()->add(resource.get());
+    // Create two RawResources and set one to revalidate the other.
+    RawResource* oldResourcePointer = new RawResource(ResourceRequest("data:text/html,"), Resource::Raw);
+    RawResource* newResourcePointer = new RawResource(ResourceRequest("data:text/html,"), Resource::Raw);
+    newResourcePointer->setResourceToRevalidate(oldResourcePointer);
+    ResourcePtr<Resource> oldResource = oldResourcePointer;
+    ResourcePtr<Resource> newResource = newResourcePointer;
+    memoryCache()->add(oldResource.get());
+    memoryCache()->remove(oldResource.get());
+    memoryCache()->add(newResource.get());
 
     // Simulate a successful revalidation.
-    resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
-    ResourceResponse revalidatingResponse;
-    revalidatingResponse.setHTTPStatusCode(304);
-    resource->responseReceived(revalidatingResponse, nullptr);
-    EXPECT_FALSE(resource->isCacheValidator());
-    EXPECT_EQ(200, resource->response().httpStatusCode());
-    EXPECT_EQ(4u, resource->resourceBuffer()->size());
-    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource.get());
+    // The revalidated resource (oldResource) should now be in the cache, newResource
+    // should have been sliently switched to point to the revalidated resource, and
+    // we shouldn't hit any ASSERTs.
+    ResourceResponse response;
+    response.setHTTPStatusCode(304);
+    newResource->responseReceived(response, nullptr);
+    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), oldResource.get());
+    EXPECT_EQ(oldResource.get(), newResource.get());
+    EXPECT_NE(newResource.get(), newResourcePointer);
 }
 
 class DummyClient : public RawResourceClient {
 public:
     DummyClient() : m_called(false) {}
     ~DummyClient() override {}
 
     // ResourceClient implementation.
     virtual void notifyFinished(Resource* resource)
     {
@@ skipping 84 matching lines @@
 
     OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient());
     OwnPtr<RemovingClient> removingClient = adoptPtr(new RemovingClient(dummyClient.get()));
     raw->addClient(dummyClient.get());
     raw->addClient(removingClient.get());
     testing::runPendingTasks();
     EXPECT_FALSE(raw->hasClients());
 }
 
 } // namespace blink