Upstream ShouldOverrideUrlLoading changes

android_webview/native/aw_contents.h

Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index e9d9504116684fc9c4473b58d30f37a2005297d5..c0cd802ecafdc4e07ad4fc5e6889c4b61bad84f8 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -76,8 +76,7 @@ class AwContents : public FindHelper::Listener,
                     jobject aw_contents,
                     jobject web_contents_delegate,
                     jobject contents_client_bridge,
-                    jobject io_thread_client,
-                    jobject intercept_navigation_delegate);
+                    jobject io_thread_client);
   jint GetWebContents(JNIEnv* env, jobject obj);
   jint GetAwContentsClientBridge(JNIEnv* env, jobject obj);
 
@@ -149,6 +148,7 @@ class AwContents : public FindHelper::Listener,
       float page_scale_factor) OVERRIDE;
   virtual void OnWebLayoutContentsSizeChanged(
       const gfx::Size& contents_size) OVERRIDE;
+  virtual bool OnShouldOverrideUrlLoading(const base::string16& url) OVERRIDE;
 
   // BrowserViewRenderer::Client implementation.
   virtual bool RequestDrawGL(jobject canvas) OVERRIDE;