Change bool ignoreCache to WebFrameLoadType

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 239 matching lines @@
 using blink::WebData;
 using blink::WebDataSource;
 using blink::WebDocument;
 using blink::WebDOMEvent;
 using blink::WebDOMMessageEvent;
 using blink::WebElement;
 using blink::WebExternalPopupMenu;
 using blink::WebExternalPopupMenuClient;
 using blink::WebFindOptions;
 using blink::WebFrame;
+using blink::WebFrameLoadType;
 using blink::WebFrameSerializer;
 using blink::WebFrameSerializerClient;
 using blink::WebHistoryItem;
 using blink::WebHTTPBody;
 using blink::WebLocalFrame;
 using blink::WebMediaPlayer;
 using blink::WebMediaPlayerClient;
 using blink::WebMediaPlayerEncryptedMediaClient;
 using blink::WebMediaSession;
 using blink::WebNavigationPolicy;
@@ skipping 1826 matching lines @@
 
   WebDOMMessageEvent msg_event(serialized_script_value,
                                params.source_origin,
                                source_frame,
                                frame_->document(),
                                channels);
   frame_->dispatchMessageEventWithOriginCheck(target_origin, msg_event);
 }
 
 void RenderFrameImpl::OnReload(bool ignore_cache) {
-  frame_->reload(ignore_cache);
+  // TODO(crbug.com/599364): Rename |ignore_cache| or change it to enum.
+  // Eventually we may remove FrameMsg_Reload, and use FrameMsg_Navigate.
+  frame_->reload(ignore_cache ? WebFrameLoadType::ReloadBypassingCache
+                              : WebFrameLoadType::Reload);
 }
 
 void RenderFrameImpl::OnReloadLoFiImages() {
   is_using_lofi_ = false;
   GetWebFrame()->reloadLoFiImages();
 }
 
 void RenderFrameImpl::OnTextSurroundingSelectionRequest(uint32_t max_length) {
   blink::WebSurroundingText surroundingText;
   surroundingText.initialize(frame_->selectionRange(), max_length);
@@ skipping 3183 matching lines @@
   if (browser_side_navigation)
     request.setCheckForBrowserSideNavigation(false);
 
   // If we are reloading, then use the history state of the current frame.
   // Otherwise, if we have history state, then we need to navigate to it, which
   // corresponds to a back/forward navigation event. Update the parameters
   // depending on the navigation type.
   if (is_reload) {
     bool ignore_cache = (common_params.navigation_type ==
                          FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE);
-    load_type = ignore_cache ? blink::WebFrameLoadType::ReloadBypassingCache
-                             : blink::WebFrameLoadType::Reload;
+    load_type = ignore_cache ? WebFrameLoadType::ReloadBypassingCache
+                             : WebFrameLoadType::Reload;
 
     if (!browser_side_navigation) {
       const GURL override_url =
           (common_params.navigation_type ==
            FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL)
               ? common_params.url
               : GURL();
       request = frame_->requestForReload(load_type, override_url);
     }
     should_load_request = true;
@@ skipping 353 matching lines @@
     data_url = GURL(request_params.data_url_as_string);
     if (!data_url.is_valid() || !data_url.SchemeIs(url::kDataScheme)) {
       data_url = params.url;
     }
   }
 #endif
   std::string mime_type, charset, data;
   if (net::DataURL::Parse(data_url, &mime_type, &charset, &data)) {
     const GURL base_url = params.base_url_for_data_url.is_empty() ?
         params.url : params.base_url_for_data_url;
-    bool replace = load_type == blink::WebFrameLoadType::ReloadBypassingCache ||
-                   load_type == blink::WebFrameLoadType::Reload;
+    bool replace = load_type == WebFrameLoadType::ReloadBypassingCache ||
+                   load_type == WebFrameLoadType::Reload;
 
     frame->loadData(
         WebData(data.c_str(), data.length()), WebString::fromUTF8(mime_type),
         WebString::fromUTF8(charset), base_url,
         // Needed so that history-url-only changes don't become reloads.
         params.history_url_for_data_url, replace, load_type,
         item_for_history_navigation, history_load_type, is_client_redirect);
   } else {
     CHECK(false) << "Invalid URL passed: "
                  << params.url.possibly_invalid_spec();
@@ skipping 335 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content