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

content/browser/android/web_contents_observer_android.cc

Index: content/browser/android/web_contents_observer_android.cc
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
index 344a901149df9eb25345e788a54f8abb995be300..6295be50a14bfc13a9d3598204131233d7a2d040 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -16,6 +16,7 @@
 #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;
@@ -215,6 +216,7 @@ void WebContentsObserverAndroid::DidFinishLoad(
     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.
@@ -223,8 +225,12 @@ void WebContentsObserverAndroid::DidFinishLoad(
 
   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(