Plausible fix for crash in GetCertificateChain.

chrome/browser/ui/android/website_settings_popup_android.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/android/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/generated_resources.h"
 #include "jni/WebsiteSettingsPopup_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::GetClass;
 using base::android::ScopedJavaLocalRef;
 using content::CertStore;
 using content::WebContents;
 
 static jobjectArray GetCertificateChain(JNIEnv* env,
                                         jobject obj,
-                                        jobject view) {
-  content::WebContents* contents =
-      content::ContentViewCore::GetNativeContentViewCore(env, view)->
-          GetWebContents();
-  int cert_id = contents->GetController().GetVisibleEntry()->GetSSL().cert_id;
+                                        jobject java_web_contents) {
+  content::WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(java_web_contents);
+  if (!web_contents) {

[Ted C, 2014/06/11 23:32:41]

personally I would drop the braces.

[Yaron, 2014/06/12 01:04:28]

Done.

+    return NULL;
+  }
+  int cert_id =
+      web_contents->GetController().GetVisibleEntry()->GetSSL().cert_id;
   scoped_refptr<net::X509Certificate> cert;
   bool ok = CertStore::GetInstance()->RetrieveCert(cert_id, &cert);
   CHECK(ok);
 
   std::vector<std::string> cert_chain;
   net::X509Certificate::OSCertHandles cert_handles =
       cert->GetIntermediateCertificates();
   // Make sure the peer's own cert is the first in the chain, if it's not
   // already there.
   if (cert_handles.empty() || cert_handles[0] != cert->os_cert_handle())
     cert_handles.insert(cert_handles.begin(), cert->os_cert_handle());
 
   cert_chain.reserve(cert_handles.size());
   for (net::X509Certificate::OSCertHandles::const_iterator it =
            cert_handles.begin();
        it != cert_handles.end();
        ++it) {
     std::string cert_bytes;
     net::X509Certificate::GetDEREncoded(*it, &cert_bytes);
     cert_chain.push_back(cert_bytes);
   }
 
   // OK to release, JNI binding.
   return base::android::ToJavaArrayOfByteArray(env, cert_chain).Release();
 }
 
 // static
-void WebsiteSettingsPopupAndroid::Show(JNIEnv* env,
-                                       jobject context,
-                                       jobject java_content_view,
-                                       WebContents* web_contents) {
-  new WebsiteSettingsPopupAndroid(env, context, java_content_view,
-                                  web_contents);
+static jlong Init(JNIEnv* env,
+                  jclass clazz,
+                  jobject obj,
+                  jobject java_web_contents) {
+  content::WebContents* web_contents =
+       content::WebContents::FromJavaWebContents(java_web_contents);

[Ted C, 2014/06/11 23:32:41]

this is indented 5 instead of 4

[Yaron, 2014/06/12 01:04:28]

Done.

+
+  return reinterpret_cast<intptr_t>(
+      new WebsiteSettingsPopupAndroid(env, obj, web_contents));
 }
 
 WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
     JNIEnv* env,
-    jobject context,
-    jobject java_content_view,
+    jobject java_website_settings_pop,
     WebContents* web_contents) {
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   content::NavigationEntry* nav_entry =
       web_contents->GetController().GetVisibleEntry();
   if (nav_entry == NULL)
     return;
 
-  popup_jobject_.Reset(
-      Java_WebsiteSettingsPopup_create(env, context, java_content_view,
-                                       reinterpret_cast<intptr_t>(this)));
+  popup_jobject_.Reset(env, java_website_settings_pop);
 
   presenter_.reset(new WebsiteSettings(
       this,
       Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents),
       InfoBarService::FromWebContents(web_contents),
       nav_entry->GetURL(),
       nav_entry->GetSSL(),
       content::CertStore::GetInstance()));
 }
@@ skipping 75 matching lines @@
 void WebsiteSettingsPopupAndroid::SetFirstVisit(
     const base::string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }