Refactor client cert private key handling.

chrome/browser/ui/views/certificate_selector_browsertest.cc

 // Copyright 2015 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/views/certificate_selector.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/cert/x509_certificate.h"
+#include "net/ssl/client_cert_identity_test_util.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 class TestCertificateSelector : public chrome::CertificateSelector {
  public:
-  TestCertificateSelector(const net::CertificateList& certificates,
+  TestCertificateSelector(net::ClientCertIdentityList certificates,
                           content::WebContents* web_contents)
-      : CertificateSelector(certificates, web_contents) {}
+      : CertificateSelector(std::move(certificates), web_contents) {}
 
   ~TestCertificateSelector() override {
     if (!on_destroy_.is_null())
       on_destroy_.Run();
   }
 
   void Init() {
     InitWithText(base::MakeUnique<views::Label>(
         base::ASCIIToUTF16("some arbitrary text")));
   }
 
-  bool Accept() override {
+  bool AcceptCertificate(
+      std::unique_ptr<net::ClientCertIdentity> identity) override {
     if (accepted_)
       *accepted_ = true;
-    return CertificateSelector::Accept();
+    return true;
   }
 
   bool Cancel() override {
     if (canceled_)
       *canceled_ = true;
     return CertificateSelector::Cancel();
   }
 
   void TrackState(bool* accepted, bool* canceled) {
     accepted_ = accepted;
@@ skipping 21 matching lines @@
 
     client_2_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "client_2.pem");
     ASSERT_TRUE(client_2_);
   }
 
   void SetUpOnMainThread() override {
     ASSERT_TRUE(content::WaitForLoadStop(
         browser()->tab_strip_model()->GetActiveWebContents()));
 
-    net::CertificateList certificates;
-    certificates.push_back(client_1_);
-    certificates.push_back(client_2_);
-
     selector_ = new TestCertificateSelector(
-        certificates, browser()->tab_strip_model()->GetActiveWebContents());
+        net::FakeClientCertIdentityListFromCertificateList(
+            {client_1_, client_2_}),
+        browser()->tab_strip_model()->GetActiveWebContents());
     selector_->Init();
     selector_->Show();
   }
 
  protected:
   scoped_refptr<net::X509Certificate> client_1_;
   scoped_refptr<net::X509Certificate> client_2_;
 
   // The selector will be owned by the Views hierarchy and will at latest be
   // deleted during the browser shutdown.
@@ skipping 17 matching lines @@
             model->GetText(1, IDS_CERT_SELECTOR_SUBJECT_COLUMN));
   EXPECT_EQ(base::UTF8ToUTF16("E CA"),
             model->GetText(1, IDS_CERT_SELECTOR_ISSUER_COLUMN));
   EXPECT_EQ(base::string16(),
             model->GetText(1, IDS_CERT_SELECTOR_PROVIDER_COLUMN));
   EXPECT_EQ(base::UTF8ToUTF16("1002"),
             model->GetText(1, IDS_CERT_SELECTOR_SERIAL_COLUMN));
 }
 
 IN_PROC_BROWSER_TEST_F(CertificateSelectorTest, GetSelectedCert) {
-  EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert());
+  ASSERT_TRUE(selector_->GetSelectedCert());
+  EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert()->certificate());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_DOWN, false,
                                               false, false, false));
-  EXPECT_EQ(client_2_.get(), selector_->GetSelectedCert());
+  ASSERT_TRUE(selector_->GetSelectedCert());
+  EXPECT_EQ(client_2_.get(), selector_->GetSelectedCert()->certificate());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_UP, false,
                                               false, false, false));
-  EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert());
+  ASSERT_TRUE(selector_->GetSelectedCert());
+  EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert()->certificate());
 }
 
 IN_PROC_BROWSER_TEST_F(CertificateSelectorTest, DoubleClick) {
   bool accepted = false;
   bool canceled = false;
   selector_->TrackState(&accepted, &canceled);
 
   base::RunLoop loop;
   selector_->set_on_destroy(loop.QuitClosure());
 
   // Simulate double clicking on an entry in the certificate list.
   selector_->OnDoubleClick();
 
   // Wait for the dialog to be closed and destroyed.
   loop.Run();
 
   // Closing the dialog through a double click must call only the Accept()
   // function and not Cancel().
   EXPECT_TRUE(accepted);
   EXPECT_FALSE(canceled);
 }