Add a serial number column to the certificate selector dialog and fix its size.

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/base/test_data_directory.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.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,
                           content::WebContents* web_contents)
       : CertificateSelector(certificates, web_contents) {}
 
@@ skipping 17 matching lines @@
     if (canceled_)
       *canceled_ = true;
     return CertificateSelector::Cancel();
   }
 
   void TrackState(bool* accepted, bool* canceled) {
     accepted_ = accepted;
     canceled_ = canceled;
   }
 
+  using chrome::CertificateSelector::table_model_for_testing;
+
   void set_on_destroy(base::Closure on_destroy) { on_destroy_ = on_destroy; }
 
  private:
   bool* accepted_ = nullptr;
   bool* canceled_ = nullptr;
   base::Closure on_destroy_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCertificateSelector);
 };
 
@@ skipping 27 matching lines @@
   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.
   TestCertificateSelector* selector_ = nullptr;
 };
 
 }  // namespace
 
+IN_PROC_BROWSER_TEST_F(CertificateSelectorTest, GetRowText) {
+  ui::TableModel* model = selector_->table_model_for_testing();
+  EXPECT_EQ(base::UTF8ToUTF16("Client Cert A"),
+            model->GetText(0, IDS_CERT_SELECTOR_SUBJECT_COLUMN));
+  EXPECT_EQ(base::UTF8ToUTF16("B CA"),
+            model->GetText(0, IDS_CERT_SELECTOR_ISSUER_COLUMN));
+  EXPECT_EQ(base::UTF8ToUTF16(""),

[msw, 2016/04/29 18:04:54]

nit: use base::string16()

[meacer, 2016/04/29 21:50:53]

Done.

+            model->GetText(0, IDS_CERT_SELECTOR_PROVIDER_COLUMN));
+  EXPECT_EQ(base::UTF8ToUTF16("1000"),
+            model->GetText(0, IDS_CERT_SELECTOR_SERIAL_COLUMN));
+
+  EXPECT_EQ(base::UTF8ToUTF16("Client Cert D"),
+            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::UTF8ToUTF16(""),

[msw, 2016/04/29 18:04:54]

ditto

[meacer, 2016/04/29 21:50:53]

Done.

+            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());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_DOWN, false,
                                               false, false, false));
   EXPECT_EQ(client_2_.get(), selector_->GetSelectedCert());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_UP, false,
                                               false, false, false));
   EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert());
 }
 
 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);
 }