Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

third_party/WebKit/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 4141 matching lines @@
   webViewHelper.webView()->mainFrame()->setScrollOffset(
       WebSize(pageWidth / 4, pageHeight / 4));
   webViewHelper.webView()->setPageScaleFactor(pageScaleFactor);
 
   WebSize previousOffset =
       webViewHelper.webView()->mainFrame()->getScrollOffset();
   float previousScale = webViewHelper.webView()->pageScaleFactor();
 
   // 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,
             webViewHelper.webView()->mainFrame()->getScrollOffset().width);
   EXPECT_EQ(previousOffset.height,
             webViewHelper.webView()->mainFrame()->getScrollOffset().height);
   EXPECT_EQ(previousScale, webViewHelper.webView()->pageScaleFactor());
 
   // 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);
   EXPECT_EQ(0, webViewHelper.webView()->mainFrame()->getScrollOffset().height);
   EXPECT_EQ(1.0f, webViewHelper.webView()->pageScaleFactor());
 
   // Reload the page while bypassing the cache. State should not be propagated.
   webViewHelper.webView()->mainFrame()->reloadWithOverrideURL(
       toKURL(m_baseURL + thirdURL), WebFrameLoadType::ReloadBypassingCache);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
@@ skipping 2981 matching lines @@
   // Sub-frames should not be forcibly revalidated.
   // TODO(toyoshim): Will consider to revalidate main resources in sub-frames
   // on reloads. Or will do only for bypassingCache.
   EXPECT_EQ(childClient.getCachePolicy(),
             WebCachePolicy::UseProtocolCachePolicy);
 }
 
 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) {
   registerMockedHttpURLLoad("navigate_to_same.html");
   TestSameDocumentWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true,
                                   &client);
-  EXPECT_FALSE(client.frameLoadTypeReloadMainResourceSeen());
+  EXPECT_FALSE(client.frameLoadTypeReloadSeen());
 
   FrameLoadRequest frameRequest(
       0,
       ResourceRequest(toLocalFrame(webViewHelper.webView()->page()->mainFrame())
                           ->document()
                           ->url()));
   toLocalFrame(webViewHelper.webView()->page()->mainFrame())
       ->loader()
       .load(frameRequest);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
 
-  EXPECT_TRUE(client.frameLoadTypeReloadMainResourceSeen());
+  EXPECT_TRUE(client.frameLoadTypeReloadSeen());
 }
 
 class TestSameDocumentWithImageWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestSameDocumentWithImageWebFrameClient() : m_numOfImageRequests(0) {}
 
   virtual void willSendRequest(WebLocalFrame*, WebURLRequest& request) {
     if (request.getRequestContext() == WebURLRequest::RequestContextImage) {
       m_numOfImageRequests++;
@@ skipping 4222 matching lines @@
   EXPECT_FALSE(testSelectAll("<textarea></textarea>"));
   EXPECT_TRUE(testSelectAll("<textarea>nonempty</textarea>"));
   EXPECT_FALSE(testSelectAll("<input>"));
   EXPECT_TRUE(testSelectAll("<input value='nonempty'>"));
   // TODO(amaralp): Empty contenteditable should not have select all enabled.
   EXPECT_TRUE(testSelectAll("<div contenteditable></div>"));
   EXPECT_TRUE(testSelectAll("<div contenteditable>nonempty</div>"));
 }
 
 }  // namespace blink