android_webview: Replace usage of GetActiveEntry by GetLastCommittedEntry.

android_webview/native/aw_contents.cc

 // Copyright 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 "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 673 matching lines @@
 }
 
 void AwContents::OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   content::NavigationEntry* entry =
-      web_contents_->GetController().GetActiveEntry();
+      web_contents_->GetController().GetLastCommittedEntry();
 
   if (entry) {

[nasko, 2015/07/03 10:00:59]

Just a generic comment for the overall code structure: Shouldn't we be verifying
that the icon we are setting is on the correct navigation entry? It seems to me
that it is possible to start a fetch of an icon, which is slow for some reason,
then navigate very fast to a different site. If the icon fetch completes after
we've navigated to the different site, won't this stamp the icon on the wrong
site?

[Torne, 2015/07/03 10:12:59]

Hm, possibly :/

File a bug and we can look into it?

     entry->GetFavicon().valid = true;
     entry->GetFavicon().url = icon_url;
     entry->GetFavicon().image = gfx::Image::CreateFrom1xBitmap(bitmap);
   }
 
   Java_AwContents_onReceivedIcon(
       env, obj.obj(), gfx::ConvertToJavaBitmap(&bitmap).obj());
 }
 
 void AwContents::OnReceivedTouchIconUrl(const std::string& url,
@@ skipping 29 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
     devtools_instrumentation::ScopedEmbedderCallbackTask embedder_callback(
         "onNewPicture");
     Java_AwContents_onNewPicture(env, obj.obj());
   }
 }
 
-base::android::ScopedJavaLocalRef<jbyteArray>
-    AwContents::GetCertificate(JNIEnv* env,
-                               jobject obj) {
+base::android::ScopedJavaLocalRef<jbyteArray> AwContents::GetCertificate(
+    JNIEnv* env,
+    jobject obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::NavigationEntry* entry =
-      web_contents_->GetController().GetActiveEntry();
+      web_contents_->GetController().GetLastCommittedEntry();
   if (!entry)
     return ScopedJavaLocalRef<jbyteArray>();
   // Get the certificate
   int cert_id = entry->GetSSL().cert_id;
   scoped_refptr<net::X509Certificate> cert;
   bool ok = content::CertStore::GetInstance()->RetrieveCert(cert_id, &cert);
   if (!ok)
     return ScopedJavaLocalRef<jbyteArray>();
 
   // Convert the certificate and return it
@@ skipping 427 matching lines @@
 
   AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports,
       GetMessagePortMessageFilter());
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview