Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm |
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm |
index b0798358541aa99ff25c65f686725c7c02182bde..058443e78bda54bc8f7e2c80ef0ba9babdd6916a 100644 |
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm |
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm |
@@ -19,9 +19,6 @@ |
#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" |
@@ -59,45 +56,8 @@ |
} // 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) { |
@@ -117,8 +77,7 @@ |
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()); |
@@ -142,8 +101,7 @@ |
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]; |
@@ -190,8 +148,7 @@ |
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; |