WebFrameTest: use ReloadMainResource instead of Reload

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

 /*
  * Copyright (C) 2011 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 120 matching lines @@
                      const WebHistoryItem& item,
                      WebHistoryLoadType loadType,
                      WebCachePolicy cachePolicy) {
   WebURLRequest request =
       frame->toWebLocalFrame()->requestFromHistoryItem(item, cachePolicy);
   frame->toWebLocalFrame()->load(request, WebFrameLoadType::BackForward, item);
   pumpPendingRequestsForFrameToLoad(frame);
 }
 
 void reloadFrame(WebFrame* frame) {
-  frame->reload(WebFrameLoadType::Reload);
+  frame->reload(WebFrameLoadType::ReloadMainResource);
   pumpPendingRequestsForFrameToLoad(frame);
 }
 
-void reloadFrameIgnoringCache(WebFrame* frame) {
+void reloadFrameBypassingCache(WebFrame* frame) {
   frame->reload(WebFrameLoadType::ReloadBypassingCache);
   pumpPendingRequestsForFrameToLoad(frame);
 }
 
 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) {
   Platform::current()->currentThread()->getWebTaskRunner()->postTask(
       BLINK_FROM_HERE, WTF::bind(&runServeAsyncRequestsTask,
                                  WTF::unretained(testClientForFrame(frame))));
   testing::enterRunLoop();
 }
@@ skipping 185 matching lines @@
   m_testWebViewClient->scheduleAnimation();
 }
 
 void TestWebViewWidgetClient::didMeaningfulLayout(
     WebMeaningfulLayout layoutType) {
   m_testWebViewClient->didMeaningfulLayout(layoutType);
 }
 
 }  // namespace FrameTestHelpers
 }  // namespace blink