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, 5 insertions, 9 deletions

diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.h b/components/navigation_interception/intercept_navigation_resource_throttle.h
index ee9cc41..ab19556 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle.h
+++ b/components/navigation_interception/intercept_navigation_resource_throttle.h
@@ -10,13 +10,11 @@
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/resource_throttle.h"
-#include "content/public/common/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 class RenderViewHost;
-struct Referrer;
 }
 
 namespace net {
@@ -25,17 +23,15 @@ class URLRequest;
 
 namespace components {
 
+class NavigationParams;
+
 // This class allows the provider of the Callback to selectively ignore top
 // level navigations.
 class InterceptNavigationResourceThrottle : public content::ResourceThrottle {
  public:
-  typedef base::Callback<
-      bool(content::RenderViewHost* /* source */,
-           const GURL& /* url */,
-           const content::Referrer& /*referrer*/,
-           bool /* is_post */,
-           bool /* has_user_gesture */,
-           content::PageTransition /* page transition type */)>
+  typedef base::Callback<bool(
+          content::RenderViewHost* /* source */,
+          const NavigationParams& /* navigation_params */)>
       CheckOnUIThreadCallback;
 
   InterceptNavigationResourceThrottle(