Index: content/browser/android/content_view_core_impl.cc |
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc |
index 32cd33500404133cd7f372b5dfd90ae9af493000..84d7435fe64d4257fb7df450da7c638c346cff50 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -802,7 +802,12 @@ void ContentViewCoreImpl::SetAllUserAgentOverridesInHistory( |
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL( |
JNIEnv* env, jobject) const { |
- return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec()); |
+ // The current users of the Java API expect to use the active entry |
+ // rather than the visible entry, which is exposed by WebContents::GetURL. |
+ content::NavigationEntry* entry = |
+ web_contents_->GetController().GetActiveEntry(); |
+ GURL url = entry ? entry->GetVirtualURL() : GURL::EmptyGURL(); |
+ return ConvertUTF8ToJavaString(env, url.spec()); |
} |
ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle( |