Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations.

chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.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 "chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 73 matching lines @@
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jstring> java_url =
         ConvertUTF8ToJavaString(env, url.spec());
     Java_WebContentsDelegateAndroid_openNewTab(env,
                                                obj.obj(),
                                                java_url.obj(),
                                                disposition == OFF_THE_RECORD);
     return NULL;
   }
 
-  // TODO(mkosiba): This should be in platform_utils OpenExternal, b/6174564.
-  if (transition == content::PAGE_TRANSITION_LINK && ShouldOverrideLoading(url))
-    return NULL;
-
   source->GetController().LoadURL(url, params.referrer, transition,
                                   std::string());
   return source;
 }
 
-// ShouldIgnoreNavigation will be called for every non-local top level
-// navigation made by the renderer. If true is returned the renderer will
-// not perform the navigation. This is done by using synchronous IPC so we
-// should avoid blocking calls from this method.
-bool WebContentsDelegateAndroid::ShouldIgnoreNavigation(
-    WebContents* source,
-    const GURL& url,
-    const content::Referrer& referrer,
-    WindowOpenDisposition disposition,
-    content::PageTransition transition_type) {
-
-  // Don't override new tabs.
-  if (disposition == NEW_FOREGROUND_TAB ||
-      disposition == NEW_BACKGROUND_TAB ||
-      disposition == OFF_THE_RECORD)
-    return false;
-
-  return ShouldOverrideLoading(url);
-}
-
 void WebContentsDelegateAndroid::NavigationStateChanged(
     const WebContents* source, unsigned changed_flags) {
   if (changed_flags & (
       content::INVALIDATE_TYPE_TAB | content::INVALIDATE_TYPE_TITLE)) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
     if (obj.is_null())
       return;
     Java_WebContentsDelegateAndroid_onTabHeaderStateChanged(
         env, obj.obj());
@@ skipping 158 matching lines @@
 }
 
 void WebContentsDelegateAndroid::OnStartDownload(WebContents* source,
                                                  DownloadItem* download) {
   // TODO(leandrogracia): re-enable this when calling DownloadController
   // doesn't introduce a DEPS layering violation.
   // DownloadController::GetInstance()->OnPostDownloadStarted(
   //     source, download);
 }
 
-bool WebContentsDelegateAndroid::ShouldOverrideLoading(const GURL& url) {
-  if (!url.is_valid())
-    return false;
-
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
-  if (obj.is_null())
-    return WebContentsDelegate::ShouldOverrideLoading(url);
-  ScopedJavaLocalRef<jstring> jstring_url =
-      ConvertUTF8ToJavaString(env, url.spec());
-  bool ret = Java_WebContentsDelegateAndroid_shouldOverrideUrlLoading(
-      env, obj.obj(), jstring_url.obj());
-  return ret;
-}
-
 void WebContentsDelegateAndroid::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
   jobject key_event = event.os_event;
   if (key_event) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
     if (obj.is_null())
       return;
     Java_WebContentsDelegateAndroid_handleKeyboardEvent(
@@ skipping 23 matching lines @@
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   if (!HasClass(env, kWebContentsDelegateAndroidClassPath)) {
     DLOG(ERROR) << "Unable to find class WebContentsDelegateAndroid!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android