[android_webview] Don't call onPageFinished for history API.

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 194cf47b7398440577e7f1013e3eb6a5c6a8c20e..8d09e24608970c4727d60ac7256e46421477b0cb 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -90,19 +90,8 @@ void WebContentsObserverAndroid::DidStopLoading(
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-
-  std::string url_string;
-  NavigationEntry* entry =
-    web_contents()->GetController().GetLastCommittedEntry();
-  // Not that GetBaseURLForDataURL is only used by the Android WebView
-  if (entry && !entry->GetBaseURLForDataURL().is_empty()) {
-    url_string = entry->GetBaseURLForDataURL().possibly_invalid_spec();
-  } else {
-    url_string = web_contents()->GetLastCommittedURL().spec();
-  }
-
-  ScopedJavaLocalRef<jstring> jstring_url(
-      ConvertUTF8ToJavaString(env, url_string));
+  ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
+      env, web_contents()->GetLastCommittedURL().spec()));
   Java_WebContentsObserverAndroid_didStopLoading(
       env, obj.obj(), jstring_url.obj());
 }
@@ -211,8 +200,16 @@ void WebContentsObserverAndroid::DidFinishLoad(
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
+
+  std::string url_string = validated_url.spec();
+  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, validated_url.spec()));
+      ConvertUTF8ToJavaString(env, url_string));
   Java_WebContentsObserverAndroid_didFinishLoad(
       env, obj.obj(), frame_id, jstring_url.obj(), is_main_frame);
 }