Use a struct to pass parameters in the navigation interception callback.

The number of parameters in the InterceptNavigationResourceThrottle
has gone over the maximum size supported by base::Bind.

BUG=None
TEST=components_unittests,AndroidWebViewTests
TBR=joi@chromium.org


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

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

1 files changed, 4 insertions, 3 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index da14d1a..9d98d6e 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -33,6 +33,7 @@ import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.PageTransitionTypes;
 import org.chromium.content.common.CleanupReference;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
+import org.chromium.components.navigation_interception.NavigationParams;
 import org.chromium.net.GURLUtils;
 import org.chromium.net.X509Util;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
@@ -177,8 +178,8 @@ public class AwContents {
         }
 
         @Override
-        public boolean shouldIgnoreNavigation(String url, boolean isPost, boolean hasUserGesture,
-                                              int pageTransition) {
+        public boolean shouldIgnoreNavigation(NavigationParams navigationParams) {
+            final String url = navigationParams.url;
             boolean ignoreNavigation = false;
             if (mLastLoadUrlAddress != null && mLastLoadUrlAddress.equals(url)) {
                 // Support the case where the user clicks on a link that takes them back to the
@@ -189,7 +190,7 @@ public class AwContents {
                 // do not offer it to AwContentsClient.shouldIgnoreNavigation.
                 // The embedder is also not allowed to intercept POST requests because of
                 // crbug.com/155250.
-            } else if (!isPost) {
+            } else if (!navigationParams.isPost) {
                 ignoreNavigation = AwContents.this.mContentsClient.shouldIgnoreNavigation(url);
             }