Remove WebNode parameter from decidePolicyForNavigation

This prepares for removing the WebNode originating_node parameter from
WebFrameLoader::decidePolicyForNavigation() by adding overrides that don't
use the parameter. After Blink moves over to calling the node-less version of
these functions and is rolled into Chromium, the WebNode overrides can be deleted.

Review URL: https://chromiumcodereview.appspot.com/14330009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195211 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_view_browsertest.cc

@@ -321,7 +321,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
       GetMainFrame(),
       request,
       WebKit::WebNavigationTypeLinkClicked,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyCurrentTab, policy);
@@ -333,7 +332,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
       GetMainFrame(),
       form_request,
       WebKit::WebNavigationTypeFormSubmitted,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
@@ -344,7 +342,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
       GetMainFrame(),
       popup_request,
       WebKit::WebNavigationTypeLinkClicked,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyNewForegroundTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
@@ -360,7 +357,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
       GetMainFrame(),
       request,
       WebKit::WebNavigationTypeLinkClicked,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
@@ -371,7 +367,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
       GetMainFrame(),
       webui_request,
       WebKit::WebNavigationTypeLinkClicked,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
@@ -383,7 +378,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
       GetMainFrame(),
       data_request,
       WebKit::WebNavigationTypeFormSubmitted,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
@@ -400,7 +394,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
       new_web_view->mainFrame(),
       popup_request,
       WebKit::WebNavigationTypeLinkClicked,
-      WebKit::WebNode(),
       WebKit::WebNavigationPolicyNewForegroundTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);

content/renderer/render_view_impl.cc

@@ -2863,7 +2863,7 @@ void RenderViewImpl::loadURLExternally(
 
 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
     WebFrame* frame, const WebURLRequest& request, WebNavigationType type,
-    const WebNode&, WebNavigationPolicy default_policy, bool is_redirect) {
+    WebNavigationPolicy default_policy, bool is_redirect) {
   if (request.url() != GURL(kSwappedOutURL) &&
       GetContentClient()->renderer()->HandleNavigation(frame, request, type,
                                                        default_policy,
@@ -3058,6 +3058,13 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
   return default_policy;
 }
 
+WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
+    WebFrame* frame, const WebURLRequest& request, WebNavigationType type,
+    const WebNode&, WebNavigationPolicy default_policy, bool is_redirect) {
+  return decidePolicyForNavigation(frame, request, type,
+                                   default_policy, is_redirect);
+}
+
 bool RenderViewImpl::canHandleRequest(
     WebFrame* frame, const WebURLRequest& request) {
   // We allow WebKit to think that everything can be handled even though

content/renderer/render_view_impl.h

@@ -534,6 +534,13 @@ class CONTENT_EXPORT RenderViewImpl
                                  const WebKit::WebURLRequest& request,
                                  WebKit::WebNavigationPolicy policy,
                                  const WebKit::WebString& suggested_name);
+  virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLRequest& request,
+      WebKit::WebNavigationType type,
+      WebKit::WebNavigationPolicy default_policy,
+      bool is_redirect);
+  // DEPRECATED.
   virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
       WebKit::WebFrame* frame,
       const WebKit::WebURLRequest& request,

webkit/tools/test_shell/test_webview_delegate.cc

@@ -558,18 +558,13 @@ void TestWebViewDelegate::loadURLExternally(
 
 WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation(
     WebFrame* frame, const WebURLRequest& request,
-    WebNavigationType type, const WebNode& originating_node,
-    WebNavigationPolicy default_policy, bool is_redirect) {
+    WebNavigationType type, WebNavigationPolicy default_policy,
+    bool is_redirect) {
   WebNavigationPolicy result;
   if (policy_delegate_enabled_) {
-    printf("Policy delegate: attempt to load %s with navigation type '%s'",
+    printf("Policy delegate: attempt to load %s with navigation type '%s'\n",
            GetURLDescription(request.url()).c_str(),
            WebNavigationTypeToString(type));
-    if (!originating_node.isNull()) {
-      printf(" originating from %s",
-          GetNodeDescription(originating_node, 0).c_str());
-    }
-    printf("\n");
     if (policy_delegate_is_permissive_) {
       result = WebKit::WebNavigationPolicyCurrentTab;
     } else {
@@ -581,6 +576,14 @@ WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation(
   return result;
 }
 
+WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation(
+    WebFrame* frame, const WebURLRequest& request,
+    WebNavigationType type, const WebNode& originating_node,
+    WebNavigationPolicy default_policy, bool is_redirect) {
+  return decidePolicyForNavigation(frame, request, type,
+                                   default_policy, is_redirect);
+}
+
 bool TestWebViewDelegate::canHandleRequest(
     WebFrame* frame, const WebURLRequest& request) {
   GURL url = request.url();

webkit/tools/test_shell/test_webview_delegate.h

@@ -173,6 +173,11 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   virtual void loadURLExternally(
       WebKit::WebFrame*, const WebKit::WebURLRequest&,
       WebKit::WebNavigationPolicy);
+  virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
+      WebKit::WebFrame*, const WebKit::WebURLRequest&,
+      WebKit::WebNavigationType, WebKit::WebNavigationPolicy default_policy,
+      bool isRedirect);
+  // DEPRECATED
   virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(
       WebKit::WebFrame*, const WebKit::WebURLRequest&,
       WebKit::WebNavigationType, const WebKit::WebNode&,