Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 665 matching lines @@
 
   // Navigations to normal HTTP URLs can be handled locally.
   blink::WebURLRequest request(GURL("http://foo.com"));
   request.setFetchRequestMode(blink::WebURLRequest::FetchRequestModeNavigate);
   request.setFetchCredentialsMode(
       blink::WebURLRequest::FetchCredentialsModeInclude);
   request.setFetchRedirectMode(blink::WebURLRequest::FetchRedirectModeManual);
   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);
   if (!IsBrowserSideNavigationEnabled()) {
     EXPECT_EQ(blink::WebNavigationPolicyCurrentTab, policy);
   } else {
     // If this is a renderer-initiated navigation that just begun, it should
     // stop and be sent to the browser.
     EXPECT_EQ(blink::WebNavigationPolicyHandledByClient, policy);
 
     // If this a navigation that is ready to commit, it should be handled
     // locally.
     request.setCheckForBrowserSideNavigation(false);
     policy = frame()->decidePolicyForNavigation(policy_info);
     EXPECT_EQ(blink::WebNavigationPolicyCurrentTab, policy);
   }
 
   // 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);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
 
   // 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);
 }
 
 TEST_F(RenderViewImplTest, DecideNavigationPolicyHandlesAllTopLevel) {
   DocumentState state;
   state.set_navigation_state(NavigationStateImpl::CreateContentInitiated());
 
   RendererPreferences prefs = view()->renderer_preferences();
   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);
     EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
   }
 }
 
 TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
   // Enable bindings to simulate a WebUI view.
   view()->OnAllowBindings(BINDINGS_POLICY_WEB_UI);
 
   DocumentState state;
   state.set_navigation_state(NavigationStateImpl::CreateContentInitiated());
 
   // 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(
       policy_info);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
 
   // 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);
 
   // 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);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
 
   // Verify that a popup that creates a view first and then navigates to a
   // normal HTTP URL will be sent to the browser process, even though the
   // new view does not have any enabled_bindings_.
   blink::WebURLRequest popup_request(GURL("http://foo.com"));
   blink::WebView* new_web_view = view()->createView(
       GetMainFrame(), popup_request, blink::WebWindowFeatures(), "foo",
       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);
   EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy);
 
   CloseRenderView(new_view);
 }
 
 // Verify that security origins are replicated properly to RenderFrameProxies
 // when swapping out.
@@ skipping 1151 matching lines @@
       GetMainFrame()->dataSource()->getRequest().getExtraData());
   ASSERT_TRUE(extra_data);
   EXPECT_EQ(extra_data->service_worker_provider_id(),
             provider->provider_id());
 
   // See that subresource requests are also tagged with the provider's id.
   EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame()));
   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(),
             provider->provider_id());
 }
 
 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
   ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
   ASSERT_FALSE(frame()->render_accessibility());
 
@@ skipping 579 matching lines @@
   ExpectPauseAndResume(3);
   blink::WebScriptSource source2(
       WebString::fromUTF8("function func2() { func1(); }; func2();"));
   frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
 
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content