Revert "Make revalidation to fail when received a redirect response"

This reverts commit bf790b4.
Reason: Compile failure in RawResourceTest.cpp

BUG=614989

Review URL: https://codereview.chromium.org/2045623002 .

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#241}
Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}

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

@@ -56,7 +56,7 @@ TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse)
 
 class DummyClient final : public RawResourceClient {
 public:
-    DummyClient() : m_called(false), m_numberOfRedirectsReceived(0) {}
+    DummyClient() : m_called(false) {}
     ~DummyClient() override {}
 
     // ResourceClient implementation.
@@ -71,17 +71,10 @@ class DummyClient final : public RawResourceClient {
         m_data.append(data, length);
     }
 
-    void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) override
-    {
-        ++m_numberOfRedirectsReceived;
-    }
-
     bool called() { return m_called; }
-    int numberOfRedirectsReceived() const { return m_numberOfRedirectsReceived; }
     const Vector<char>& data() { return m_data; }
 private:
     bool m_called;
-    int m_numberOfRedirectsReceived;
     Vector<char> m_data;
 };
 
@@ -240,81 +233,6 @@ TEST(RawResourceTest, RevalidationSucceededUpdateHeaders)
     EXPECT_EQ(0u, client->data().size());
 }
 
-TEST(RawResourceTest, RedirectDuringRevalidation)
-{
-    Resource* resource = RawResource::create(ResourceRequest("https://example.com/1"), Resource::Raw);
-    ResourceResponse response;
-    response.setURL(KURL(ParsedURLString, "https://example.com/1"));
-    response.setHTTPStatusCode(200);
-    resource->responseReceived(response, nullptr);
-    const char data[5] = "abcd";
-    resource->appendData(data, 4);
-    resource->finish();
-    memoryCache()->add(resource);
-
-    EXPECT_FALSE(resource->isCacheValidator());
-    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
-    EXPECT_EQ("https://example.com/1", resource->lastResourceRequest().url().getString());
-
-    // Simulate a revalidation.
-    resource->setRevalidatingRequest(ResourceRequest("https://example.com/1"));
-    EXPECT_TRUE(resource->isCacheValidator());
-    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
-    EXPECT_EQ("https://example.com/1", resource->lastResourceRequest().url().getString());
-
-    Persistent<DummyClient> client = new DummyClient;
-    resource->addClient(client);
-
-    // The revalidating request is redirected.
-    ResourceResponse redirectResponse;
-    redirectResponse.setURL(KURL(ParsedURLString, "https://example.com/1"));
-    redirectResponse.setHTTPHeaderField("location", "https://example.com/2");
-    redirectResponse.setHTTPStatusCode(308);
-    ResourceRequest redirectedRevalidatingRequest("https://example.com/2");
-    resource->willFollowRedirect(redirectedRevalidatingRequest, redirectResponse);
-    EXPECT_FALSE(resource->isCacheValidator());
-    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
-    EXPECT_EQ("https://example.com/2", resource->lastResourceRequest().url().getString());
-
-    // The final response is received.
-    ResourceResponse revalidatingResponse;
-    revalidatingResponse.setURL(KURL(ParsedURLString, "https://example.com/2"));
-    revalidatingResponse.setHTTPStatusCode(200);
-    resource->responseReceived(revalidatingResponse, nullptr);
-    const char data2[4] = "xyz";
-    resource->appendData(data2, 3);
-    resource->finish();
-    EXPECT_FALSE(resource->isCacheValidator());
-    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
-    EXPECT_EQ("https://example.com/2", resource->lastResourceRequest().url().getString());
-    EXPECT_FALSE(resource->isCacheValidator());
-    EXPECT_EQ(200, resource->response().httpStatusCode());
-    EXPECT_EQ(3u, resource->resourceBuffer()->size());
-    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")), resource);
-
-    EXPECT_TRUE(client->called());
-    EXPECT_EQ(1, client->numberOfRedirectsReceived());
-    EXPECT_EQ("xyz", String(client->data().data(), client->data().size()));
-
-    // Test the case where a client is added after revalidation is completed.
-    Persistent<DummyClient> client2 = new DummyClient;
-    resource->addClient(client2);
-
-    // Because RawResourceClient is added asynchronously,
-    // |runPendingTasks()| is called to make |client2| to be notified.
-    testing::runPendingTasks();
-
-    EXPECT_TRUE(client2->called());
-    EXPECT_EQ(1, client2->numberOfRedirectsReceived());
-    EXPECT_EQ("xyz", String(client2->data().data(), client2->data().size()));
-
-    memoryCache()->remove(resource);
-
-    resource->removeClient(client);
-    resource->removeClient(client2);
-    EXPECT_FALSE(resource->hasClientsOrObservers());
-}
-
 TEST(RawResourceTest, AddClientDuringCallback)
 {
     Resource* raw = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);

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

@@ -552,9 +552,6 @@ void Resource::setRevalidatingRequest(const ResourceRequest& request)
 
 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
-    if (!m_revalidatingRequest.isNull())
-        revalidationFailed();
-
     newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials);
     m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
 }