Revert of Remove client_certs from SSLCertRequestInfo.

chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm

 // Copyright (c) 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.
 
 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h"
 
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 
 #include "base/bind.h"
 #import "base/mac/mac_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
-#include "net/cert/x509_certificate.h"
-#include "net/test/cert_test_util.h"
-#include "net/test/test_data_directory.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 using web_modal::WebContentsModalDialogManager;
 
 namespace {
 
 class TestClientCertificateDelegate
     : public content::ClientCertificateDelegate {
  public:
@@ skipping 17 matching lines @@
   }
 
  private:
   bool* destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(TestClientCertificateDelegate);
 };
 
 }  // namespace
 
-class SSLClientCertificateSelectorCocoaTest
-    : public SSLClientCertificateSelectorTestBase {
- public:
-  ~SSLClientCertificateSelectorCocoaTest() override;
-
-  // InProcessBrowserTest:
-  void SetUpInProcessBrowserTestFixture() override;
-
-  net::CertificateList GetTestCertificateList();
-
- private:
-  scoped_refptr<net::X509Certificate> mit_davidben_cert_;
-  scoped_refptr<net::X509Certificate> foaf_me_chromium_test_cert_;
-  net::CertificateList client_cert_list_;
-};
-
-SSLClientCertificateSelectorCocoaTest::
-    ~SSLClientCertificateSelectorCocoaTest() = default;
-
-void SSLClientCertificateSelectorCocoaTest::SetUpInProcessBrowserTestFixture() {
-  SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture();
-
-  base::FilePath certs_dir = net::GetTestCertsDirectory();
-
-  mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der");
-  ASSERT_TRUE(mit_davidben_cert_.get());
-
-  foaf_me_chromium_test_cert_ =
-      net::ImportCertFromFile(certs_dir, "foaf.me.chromium-test-cert.der");
-  ASSERT_TRUE(foaf_me_chromium_test_cert_.get());
-
-  client_cert_list_.push_back(mit_davidben_cert_);
-  client_cert_list_.push_back(foaf_me_chromium_test_cert_);
-}
-
-net::CertificateList
-SSLClientCertificateSelectorCocoaTest::GetTestCertificateList() {
-  return client_cert_list_;
-}
+typedef SSLClientCertificateSelectorTestBase
+    SSLClientCertificateSelectorCocoaTest;
 
 // Flaky on 10.7; crbug.com/313243
 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, DISABLED_Basic) {
   // TODO(kbr): re-enable: http://crbug.com/222296
   return;
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
 
   bool destroyed = false;
   SSLClientCertificateSelectorCocoa* selector = [
       [SSLClientCertificateSelectorCocoa alloc]
       initWithBrowserContext:web_contents->GetBrowserContext()
              certRequestInfo:auth_requestor_->cert_request_info_.get()
                     delegate:base::WrapUnique(new TestClientCertificateDelegate(
                                  &destroyed))];
-  [selector displayForWebContents:web_contents
-                      clientCerts:GetTestCertificateList()];
+  [selector displayForWebContents:web_contents];
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE([selector panel]);
   EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
 
   WebContentsModalDialogManager::TestApi test_api(
       web_contents_modal_dialog_manager);
   test_api.CloseAllDialogs();
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
 
   EXPECT_TRUE(destroyed);
 }
 
 // Test that switching to another tab correctly hides the sheet.
 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, HideShow) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   SSLClientCertificateSelectorCocoa* selector = [
       [SSLClientCertificateSelectorCocoa alloc]
       initWithBrowserContext:web_contents->GetBrowserContext()
              certRequestInfo:auth_requestor_->cert_request_info_.get()
                     delegate:base::WrapUnique(
                                  new TestClientCertificateDelegate(nullptr))];
-  [selector displayForWebContents:web_contents
-                      clientCerts:GetTestCertificateList()];
+  [selector displayForWebContents:web_contents];
   content::RunAllPendingInMessageLoop();
 
   NSWindow* sheetWindow = [[selector overlayWindow] attachedSheet];
   EXPECT_EQ(1.0, [sheetWindow alphaValue]);
 
   // Switch to another tab and verify that the sheet is hidden. Interaction with
   // the tab underneath should not be blocked.
   AddBlankTabAndShow(browser());
   EXPECT_EQ(0.0, [sheetWindow alphaValue]);
   EXPECT_TRUE([[selector overlayWindow] ignoresMouseEvents]);
@@ skipping 26 matching lines @@
   BOOL selector_was_deallocated = false;
 
   @autoreleasepool {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     DeallocTrackingSSLClientCertificateSelectorCocoa* selector =
         [[DeallocTrackingSSLClientCertificateSelectorCocoa alloc]
             initWithBrowserContext:web_contents->GetBrowserContext()
                    certRequestInfo:auth_requestor_->cert_request_info_.get()
                           delegate:nil];
-    [selector displayForWebContents:web_contents
-                        clientCerts:GetTestCertificateList()];
+    [selector displayForWebContents:web_contents];
     content::RunAllPendingInMessageLoop();
 
     selector.wasDeallocated = &selector_was_deallocated;
 
     [selector.overlayWindow endSheet:selector.overlayWindow.attachedSheet];
     content::RunAllPendingInMessageLoop();
   }
 
   EXPECT_TRUE(selector_was_deallocated);
 
   // Without the workaround, this will crash on Sierra.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSPreferredScrollerStyleDidChangeNotification
                     object:nil
                   userInfo:@{
                     @"NSScrollerStyle" : @(NSScrollerStyleLegacy)
                   }];
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSPreferredScrollerStyleDidChangeNotification
                     object:nil
                   userInfo:@{
                     @"NSScrollerStyle" : @(NSScrollerStyleOverlay)
                   }];
 }