Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index e90b01510a84a5881bbb34ffc668e1fdcc6c80d8..1b8b74efd51fcb9efaee49ffd8d3fb21ad7d3c58 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -683,7 +683,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
   request.setFrameType(blink::WebURLRequest::FrameTypeTopLevel);
   request.setRequestContext(blink::WebURLRequest::RequestContextInternal);
   blink::WebFrameClient::NavigationPolicyInfo policy_info(request);
-  policy_info.navigationType = blink::WebNavigationTypeLinkClicked;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
   blink::WebNavigationPolicy policy = frame()->decidePolicyForNavigation(
           policy_info);
@@ -704,7 +704,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
   // Verify that form posts to WebUI URLs will be sent to the browser process.
   blink::WebURLRequest form_request(GURL("chrome://foo"));
   blink::WebFrameClient::NavigationPolicyInfo form_policy_info(form_request);
-  form_policy_info.navigationType = blink::WebNavigationTypeFormSubmitted;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   form_policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
   form_request.setHTTPMethod("POST");
   policy = frame()->decidePolicyForNavigation(form_policy_info);
@@ -713,7 +713,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
   // Verify that popup links to WebUI URLs also are sent to browser.
   blink::WebURLRequest popup_request(GURL("chrome://foo"));
   blink::WebFrameClient::NavigationPolicyInfo popup_policy_info(popup_request);
-  popup_policy_info.navigationType = blink::WebNavigationTypeLinkClicked;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   popup_policy_info.defaultPolicy = blink::WebNavigationPolicyNewForegroundTab;
   policy = frame()->decidePolicyForNavigation(popup_policy_info);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
@@ -727,21 +727,23 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyHandlesAllTopLevel) {
   prefs.browser_handles_all_top_level_requests = true;
   view()->OnSetRendererPrefs(prefs);
 
-  const blink::WebNavigationType kNavTypes[] = {
-    blink::WebNavigationTypeLinkClicked,
-    blink::WebNavigationTypeFormSubmitted,
-    blink::WebNavigationTypeBackForward,
-    blink::WebNavigationTypeReload,
-    blink::WebNavigationTypeFormResubmitted,
-    blink::WebNavigationTypeOther,
+  const blink::WebFrameLoadType kLoadTypes[] = {
+    blink::WebFrameLoadType::Standard,
+    blink::WebFrameLoadType::BackForward,
+    blink::WebFrameLoadType::Reload,
+    blink::WebFrameLoadType::ReloadMainResource,
+    blink::WebFrameLoadType::ReplaceCurrentItem,
+    blink::WebFrameLoadType::InitialInChildFrame,
+    blink::WebFrameLoadType::InitialHistoryLoad,
+    blink::WebFrameLoadType::ReloadBypassingCache
   };
 
   blink::WebURLRequest request(GURL("http://foo.com"));
   blink::WebFrameClient::NavigationPolicyInfo policy_info(request);
   policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
 
-  for (size_t i = 0; i < arraysize(kNavTypes); ++i) {
-    policy_info.navigationType = kNavTypes[i];
+  for (size_t i = 0; i < arraysize(kLoadTypes); ++i) {
+    policy_info.loadType = kLoadTypes[i];
 
     blink::WebNavigationPolicy policy = frame()->decidePolicyForNavigation(
         policy_info);
@@ -759,7 +761,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
   // Navigations to normal HTTP URLs will be sent to browser process.
   blink::WebURLRequest request(GURL("http://foo.com"));
   blink::WebFrameClient::NavigationPolicyInfo policy_info(request);
-  policy_info.navigationType = blink::WebNavigationTypeLinkClicked;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
 
   blink::WebNavigationPolicy policy = frame()->decidePolicyForNavigation(
@@ -769,7 +771,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
   // Navigations to WebUI URLs will also be sent to browser process.
   blink::WebURLRequest webui_request(GURL("chrome://foo"));
   blink::WebFrameClient::NavigationPolicyInfo webui_policy_info(webui_request);
-  webui_policy_info.navigationType = blink::WebNavigationTypeLinkClicked;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   webui_policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
   policy = frame()->decidePolicyForNavigation(webui_policy_info);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
@@ -777,7 +779,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
   // Verify that form posts to data URLs will be sent to the browser process.
   blink::WebURLRequest data_request(GURL("data:text/html,foo"));
   blink::WebFrameClient::NavigationPolicyInfo data_policy_info(data_request);
-  data_policy_info.navigationType = blink::WebNavigationTypeFormSubmitted;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   data_policy_info.defaultPolicy = blink::WebNavigationPolicyCurrentTab;
   data_request.setHTTPMethod("POST");
   policy = frame()->decidePolicyForNavigation(data_policy_info);
@@ -792,7 +794,7 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
       blink::WebNavigationPolicyNewForegroundTab, false);
   RenderViewImpl* new_view = RenderViewImpl::FromWebView(new_web_view);
   blink::WebFrameClient::NavigationPolicyInfo popup_policy_info(popup_request);
-  popup_policy_info.navigationType = blink::WebNavigationTypeLinkClicked;
+  policy_info.loadType = blink::WebFrameLoadType::Standard;
   popup_policy_info.defaultPolicy = blink::WebNavigationPolicyNewForegroundTab;
   policy = static_cast<RenderFrameImpl*>(new_view->GetMainRenderFrame())->
       decidePolicyForNavigation(popup_policy_info);
@@ -1964,7 +1966,8 @@ TEST_F(RenderViewImplTest, ServiceWorkerNetworkProviderSetup) {
   blink::WebURLRequest request(GURL("http://foo.com"));
   request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
   blink::WebURLResponse redirect_response;
-  frame()->willSendRequest(GetMainFrame(), request);
+  frame()->willSendRequest(GetMainFrame(), request,
+      blink::WebFrameLoadType::Standard);
   extra_data = static_cast<RequestExtraData*>(request.getExtraData());
   ASSERT_TRUE(extra_data);
   EXPECT_EQ(extra_data->service_worker_provider_id(),