Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index ba56e4afa4be5448c5fb194f62998595839f11d2..b17d570639093875c1df7bb5afbd68c0132bea9f 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -4159,7 +4159,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState) {
 
   // Reload the page and end up at the same url. State should be propagated.
   webViewHelper.webView()->mainFrame()->reloadWithOverrideURL(
-      toKURL(m_baseURL + firstURL), WebFrameLoadType::ReloadMainResource);
+      toKURL(m_baseURL + firstURL), WebFrameLoadType::Reload);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
   EXPECT_EQ(previousOffset.width,
@@ -4170,7 +4170,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState) {
 
   // Reload the page using the cache. State should not be propagated.
   webViewHelper.webView()->mainFrame()->reloadWithOverrideURL(
-      toKURL(m_baseURL + secondURL), WebFrameLoadType::ReloadMainResource);
+      toKURL(m_baseURL + secondURL), WebFrameLoadType::Reload);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
   EXPECT_EQ(0, webViewHelper.webView()->mainFrame()->getScrollOffset().width);
@@ -7172,22 +7172,19 @@ TEST_P(ParameterizedWebFrameTest, ReloadIframe) {
 class TestSameDocumentWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
-  TestSameDocumentWebFrameClient()
-      : m_frameLoadTypeReloadMainResourceSeen(false) {}
+  TestSameDocumentWebFrameClient() : m_frameLoadTypeReloadSeen(false) {}
 
   virtual void willSendRequest(WebLocalFrame* frame, WebURLRequest&) {
     FrameLoader& frameLoader = toWebLocalFrameImpl(frame)->frame()->loader();
     if (frameLoader.provisionalDocumentLoader()->loadType() ==
-        FrameLoadTypeReloadMainResource)
-      m_frameLoadTypeReloadMainResourceSeen = true;
+        FrameLoadTypeReload)
+      m_frameLoadTypeReloadSeen = true;
   }
 
-  bool frameLoadTypeReloadMainResourceSeen() const {
-    return m_frameLoadTypeReloadMainResourceSeen;
-  }
+  bool frameLoadTypeReloadSeen() const { return m_frameLoadTypeReloadSeen; }
 
  private:
-  bool m_frameLoadTypeReloadMainResourceSeen;
+  bool m_frameLoadTypeReloadSeen;
 };
 
 TEST_P(ParameterizedWebFrameTest, NavigateToSame) {
@@ -7196,7 +7193,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSame) {
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true,
                                   &client);
-  EXPECT_FALSE(client.frameLoadTypeReloadMainResourceSeen());
+  EXPECT_FALSE(client.frameLoadTypeReloadSeen());
 
   FrameLoadRequest frameRequest(
       0,
@@ -7209,7 +7206,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSame) {
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
 
-  EXPECT_TRUE(client.frameLoadTypeReloadMainResourceSeen());
+  EXPECT_TRUE(client.frameLoadTypeReloadSeen());
 }
 
 class TestSameDocumentWithImageWebFrameClient