Allow showing pending URL for new tab navigations, but only if safe.

content/browser/android/content_view_core_impl.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/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 730 matching lines @@
       base::android::ConvertJavaStringToUTF8(env, user_agent_override);
   web_contents_->SetUserAgentOverride(override);
   bool override_used = !override.empty();
   const NavigationController& controller = web_contents_->GetController();
   for (int i = 0; i < controller.GetEntryCount(); ++i)
     controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override_used);
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
     JNIEnv* env, jobject) const {
-  return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
+  content::NavigationEntry* entry =

[joth, 2013/03/22 17:12:52]

I think this should comment why it's not using GetURL() (even if just saying the
change from crrev.com/12541018 was incompatibile with the existing users of the
Java API)

[Charlie Reis, 2013/03/28 19:23:19]

Done.

+      web_contents_->GetController().GetActiveEntry();
+  GURL url = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
+  return ConvertUTF8ToJavaString(env, url.spec());
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle(
     JNIEnv* env, jobject obj) const {
   return ConvertUTF16ToJavaString(env, GetWebContents()->GetTitle());
 }
 
 jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
   return GetWebContents()->GetBrowserContext()->IsOffTheRecord();
 }
@@ skipping 681 matching lines @@
       reinterpret_cast<WebContents*>(native_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(native_window));
   return reinterpret_cast<jint>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content