Don't revalidate all resources for FrameLoadTypeSame

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 5869 matching lines @@
 
     // A new WebFrame should have been created, but the child WebFrameClient should be reused.
     ASSERT_NE(childFrame, toWebLocalFrameImpl(mainFrame->firstChild()));
     ASSERT_EQ(toWebLocalFrameImpl(mainFrame->firstChild())->client(), &childClient);
 
     EXPECT_EQ(mainClient.childFrameCreationCount(), 2);
     EXPECT_EQ(childClient.willSendRequestCallCount(), 2);
     EXPECT_EQ(childClient.cachePolicy(), WebURLRequest::ReloadIgnoringCacheData);
 }
 
-class TestSameDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
-public:
-    TestSameDocumentWebFrameClient()
-        : m_frameLoadTypeSameSeen(false)
-    {
-    }
-
-    virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)
-    {
-        if (toWebLocalFrameImpl(frame)->frame()->loader().loadType() == FrameLoadTypeSame)
-            m_frameLoadTypeSameSeen = true;
-    }
-
-    bool frameLoadTypeSameSeen() const { return m_frameLoadTypeSameSeen; }
-
-private:
-    bool m_frameLoadTypeSameSeen;
-};
-
 TEST_P(ParameterizedWebFrameTest, NavigateToSame)
 {
-    registerMockedHttpURLLoad("navigate_to_same.html");
-    TestSameDocumentWebFrameClient client;
+    URLTestHelpers::registerMockedURLLoad(toKURL(m_baseURL + "navigate_to_same.html#"), WebString::fromUTF8("navigate_to_same.html"));
+    TestCachePolicyWebFrameClient client(nullptr);
     FrameTestHelpers::WebViewHelper webViewHelper(this);
-    webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true, &client);
-    EXPECT_FALSE(client.frameLoadTypeSameSeen());
+    webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html#", true, &client);
+    EXPECT_EQ(1, client.willSendRequestCallCount());
 
-    FrameLoadRequest frameRequest(0, ResourceRequest(toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document()->url()));
-    toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);
-    FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webView()->mainFrame());
-
-    EXPECT_TRUE(client.frameLoadTypeSameSeen());
+    FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "navigate_to_same.html#");
+    EXPECT_EQ(2, client.willSendRequestCallCount());
 }
 
 class TestSameDocumentWithImageWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestSameDocumentWithImageWebFrameClient()
         : m_numOfImageRequests(0)
     {
     }
 
     virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&)
@@ skipping 1923 matching lines @@
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink