[Android WebView] Filter out error page URL from onPageFinished to un-flake tests

content/browser/android/web_contents_observer_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 "content/browser/android/web_contents_observer_android.h"
 
 #include <string>
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/common/url_constants.h"
 #include "jni/WebContentsObserverAndroid_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace content {
 
 WebContentsObserverAndroid::WebContentsObserverAndroid(
@@ skipping 179 matching lines @@
     int64 frame_id,
     const GURL& validated_url,
     bool is_main_frame,
     RenderViewHost* render_view_host) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
 
   std::string url_string = validated_url.spec();
+  bool is_error_page = content::kUnreachableWebDataURL == url_string;
   NavigationEntry* entry =
     web_contents()->GetController().GetLastCommittedEntry();
   // Note that GetBaseURLForDataURL is only used by the Android WebView.
   if (entry && !entry->GetBaseURLForDataURL().is_empty())
     url_string = entry->GetBaseURLForDataURL().possibly_invalid_spec();
 
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url_string));

[bulach, 2014/06/17 00:42:12]

hmm.... I'm not quite sure about the approach here... the param "is_error_page"
on a method called "didFinishLoad" can be *fairly* ambiguous, I was originally
thinking about interstitial pages, and what not...
since it's just testing the particular value for the URL it receives on tests,
rather than changing the API at this level, how about just changing higher up to
detect something like "isUnreacheableWebDataUrl()" or something? would that
simplify things?

[mnaganov (inactive), 2014/06/17 09:52:15]

Yes, sounds reasonable. Sorry for not making that initially.

-  Java_WebContentsObserverAndroid_didFinishLoad(
-      env, obj.obj(), frame_id, jstring_url.obj(), is_main_frame);
+  Java_WebContentsObserverAndroid_didFinishLoad(env,
+                                                obj.obj(),
+                                                frame_id,
+                                                jstring_url.obj(),
+                                                is_main_frame,
+                                                is_error_page);
 }
 
 void WebContentsObserverAndroid::DocumentLoadedInFrame(
     int64 frame_id,
     RenderViewHost* render_view_host) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
   Java_WebContentsObserverAndroid_documentLoadedInFrame(
@@ skipping 54 matching lines @@
   if (obj.is_null())
     return;
   Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint(
       env, obj.obj());
 }
 
 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 }  // namespace content