WebView: carefully check size for SafeBrowsing interstitial

android_webview/native/aw_contents.cc

 // Copyright 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 "android_webview/native/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 1389 matching lines @@
       web_contents_->GetRenderViewHost()) {
     compositor_id.process_id = web_contents_->GetRenderProcessHost()->GetID();
     compositor_id.routing_id =
         web_contents_->GetRenderViewHost()->GetRoutingID();
   } else {
     LOG(WARNING) << "failed setting the compositor on detaching interstitital";
   }
   browser_view_renderer_.SetActiveCompositorID(compositor_id);
 }
 
 bool AwContents::CanShowInterstitial() {

[sgurun-gerrit only, 2017/04/24 22:44:10]

nobody seems to call this, what is your plan on this?

[Nate Fischer, 2017/04/24 23:00:53]

Once we support a second interstitial, we should use this to distinguish between
when to use the big interstitial vs. small interstitial:

if (CanShowBigInterstitial()) {
  // Use the big interstitial
} else if (CanShowInterstitial()) {
  // Use the small interstitial
} else {
  // Straight to network error
}

As you pointed out, we can remove this code now, but it sounds like we would be
adding it back once we support this. Your call if we should remove it for now.

   JNIEnv* env = AttachCurrentThread();
   const ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
   return Java_AwContents_canShowInterstitial(env, obj);
 }
 
+bool AwContents::CanShowBigInterstitial() {
+  JNIEnv* env = AttachCurrentThread();
+  const ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return false;
+  return Java_AwContents_canShowBigInterstitial(env, obj);
+}
+
 void AwContents::CallProceedOnInterstitialForTesting(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj) {
   DCHECK(web_contents_->GetInterstitialPage());
   web_contents_->GetInterstitialPage()->Proceed();
 }
 
 void AwContents::CallDontProceedOnInterstitialForTesting(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj) {
@@ skipping 21 matching lines @@
 
   return Java_AwContents_onRenderProcessGoneDetail(env, obj,
       child_process_id, crashed);
 }
 
 void AwContents::RenderProcessReady(content::RenderProcessHost* host) {
   UpdateRendererPriority();
 }
 
 }  // namespace android_webview