Refactor ActivityStatus to not store current activity

chrome/browser/ui/android/ssl_client_certificate_request.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/ssl_client_certificate_request.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
+#include "chrome/browser/ui/android/window_android_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SSLClientCertificateRequest_jni.h"
 #include "net/android/keystore_openssl.h"
 #include "net/base/host_port_pair.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_client_cert_type.h"
+#include "ui/base/android/window_android.h"
 
 namespace chrome {
 
 namespace {
 
 typedef net::OpenSSLClientKeyStore::ScopedEVP_PKEY ScopedEVP_PKEY;
 
 // Must be called on the I/O thread to record a client certificate
 // and its private key in the OpenSSLClientKeyStore.
 void RecordClientCertificateKey(
     const scoped_refptr<net::X509Certificate>& client_cert,
     ScopedEVP_PKEY private_key) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   net::OpenSSLClientKeyStore::GetInstance()->RecordClientCertPrivateKey(
       client_cert.get(), private_key.get());
 }
 
 void StartClientCertificateRequest(
     const net::SSLCertRequestInfo* cert_request_info,
+    const ui::WindowAndroid* window,
     const chrome::SelectCertificateCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
+  if (!window) {

[Ted C, 2014/02/13 04:38:44]

Since you DCHECK window below, you should be able to remove this.  If you have a
DCHECK, you aren't supposed to try and handle the failure case (despite that
being my thinking several months ago)

[David Trainor- moved to gerrit, 2014/02/13 05:03:55]

Yeah I thought about that too, but was trying to follow the same behavior as I
saw elsewhere in this file (although now I can't find what I was mirroring). 
Will change.

[David Trainor- moved to gerrit, 2014/02/14 19:13:36]

Done.

+    LOG(ERROR) << "Invalid WindowAndroid";
+    return;
+  }
+
   // Ensure that callback(NULL) is posted as a task on the UI thread
   // in case of an error.
   base::Closure post_task_closure = base::Bind(
       base::IgnoreResult(&content::BrowserThread::PostTask),
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(callback, scoped_refptr<net::X509Certificate>()));
 
   base::ScopedClosureRunner guard(post_task_closure);
 
@@ skipping 41 matching lines @@
 
   // Create a copy of the callback on the heap so that its address
   // and ownership can be passed through and returned from Java via JNI.
   scoped_ptr<chrome::SelectCertificateCallback> request(
       new chrome::SelectCertificateCallback(callback));
 
   jint request_id = reinterpret_cast<jint>(request.get());
 
   if (!chrome::android::
       Java_SSLClientCertificateRequest_selectClientCertificate(
-          env, request_id, key_types_ref.obj(), principals_ref.obj(),
-          host_name_ref.obj(), cert_request_info->host_and_port.port())) {
+          env,
+          request_id,
+          window->GetJavaObject().obj(),
+          key_types_ref.obj(),
+          principals_ref.obj(),
+          host_name_ref.obj(),
+          cert_request_info->host_and_port.port())) {
     return;
   }
 
   ignore_result(guard.Release());
 
   // Ownership was transferred to Java.
   chrome::SelectCertificateCallback* ALLOW_UNUSED dummy =
       request.release();
 }
 
@@ skipping 80 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const chrome::SelectCertificateCallback& callback) {
+  ui::WindowAndroid* window =
+      WindowAndroidHelper::FromWebContents(contents)->GetWindowAndroid();
+  DCHECK(window);
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  StartClientCertificateRequest(cert_request_info, callback);
+  StartClientCertificateRequest(cert_request_info, window, callback);
 }
 
 }  // namespace chrome