Index: chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc |
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc |
index 7dd35b5c4bbffdfc8f9994f2e16deee397eeac32..390abd4541c9961e475105ee18a3eda8f1b9c1eb 100644 |
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc |
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc |
@@ -42,7 +42,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { |
selector_(NULL) { |
} |
- virtual void SetUpInProcessBrowserTestFixture() override { |
+ void SetUpInProcessBrowserTestFixture() override { |
base::FilePath certs_dir = net::GetTestCertsDirectory(); |
mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der"); |
@@ -60,7 +60,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { |
cert_request_info_->client_certs.push_back(foaf_me_chromium_test_cert_); |
} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
url_request_context_getter_ = browser()->profile()->GetRequestContext(); |
BrowserThread::PostTask( |
@@ -93,7 +93,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { |
// Have to release our reference to the auth handler during the test to allow |
// it to be destroyed while the Browser and its IO thread still exist. |
- virtual void TearDownOnMainThread() override { |
+ void TearDownOnMainThread() override { |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&SSLClientCertificateSelectorTest::CleanUpOnIOThread, this)); |
@@ -132,7 +132,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { |
class SSLClientCertificateSelectorMultiTabTest |
: public SSLClientCertificateSelectorTest { |
public: |
- virtual void SetUpInProcessBrowserTestFixture() override { |
+ void SetUpInProcessBrowserTestFixture() override { |
SSLClientCertificateSelectorTest::SetUpInProcessBrowserTestFixture(); |
cert_request_info_1_ = new net::SSLCertRequestInfo; |
@@ -146,7 +146,7 @@ class SSLClientCertificateSelectorMultiTabTest |
cert_request_info_2_->client_certs.push_back(foaf_me_chromium_test_cert_); |
} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
// Also calls SetUpOnIOThread. |
SSLClientCertificateSelectorTest::SetUpOnMainThread(); |
@@ -176,7 +176,7 @@ class SSLClientCertificateSelectorMultiTabTest |
EXPECT_EQ(mit_davidben_cert_.get(), selector_2_->GetSelectedCert()); |
} |
- virtual void SetUpOnIOThread() override { |
+ void SetUpOnIOThread() override { |
url_request_1_ = |
MakeURLRequest(url_request_context_getter_.get()).release(); |
url_request_2_ = |
@@ -192,13 +192,13 @@ class SSLClientCertificateSelectorMultiTabTest |
SSLClientCertificateSelectorTest::SetUpOnIOThread(); |
} |
- virtual void TearDownOnMainThread() override { |
+ void TearDownOnMainThread() override { |
auth_requestor_2_ = NULL; |
auth_requestor_1_ = NULL; |
SSLClientCertificateSelectorTest::TearDownOnMainThread(); |
} |
- virtual void CleanUpOnIOThread() override { |
+ void CleanUpOnIOThread() override { |
delete url_request_1_; |
delete url_request_2_; |
SSLClientCertificateSelectorTest::CleanUpOnIOThread(); |
@@ -218,7 +218,7 @@ class SSLClientCertificateSelectorMultiTabTest |
class SSLClientCertificateSelectorMultiProfileTest |
: public SSLClientCertificateSelectorTest { |
public: |
- virtual void SetUpInProcessBrowserTestFixture() override { |
+ void SetUpInProcessBrowserTestFixture() override { |
SSLClientCertificateSelectorTest::SetUpInProcessBrowserTestFixture(); |
cert_request_info_1_ = new net::SSLCertRequestInfo; |
@@ -227,7 +227,7 @@ class SSLClientCertificateSelectorMultiProfileTest |
cert_request_info_1_->client_certs.push_back(foaf_me_chromium_test_cert_); |
} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
browser_1_ = CreateIncognitoBrowser(); |
url_request_context_getter_1_ = browser_1_->profile()->GetRequestContext(); |
@@ -244,7 +244,7 @@ class SSLClientCertificateSelectorMultiProfileTest |
EXPECT_EQ(mit_davidben_cert_.get(), selector_1_->GetSelectedCert()); |
} |
- virtual void SetUpOnIOThread() override { |
+ void SetUpOnIOThread() override { |
url_request_1_ = |
MakeURLRequest(url_request_context_getter_1_.get()).release(); |
@@ -255,12 +255,12 @@ class SSLClientCertificateSelectorMultiProfileTest |
SSLClientCertificateSelectorTest::SetUpOnIOThread(); |
} |
- virtual void TearDownOnMainThread() override { |
+ void TearDownOnMainThread() override { |
auth_requestor_1_ = NULL; |
SSLClientCertificateSelectorTest::TearDownOnMainThread(); |
} |
- virtual void CleanUpOnIOThread() override { |
+ void CleanUpOnIOThread() override { |
delete url_request_1_; |
SSLClientCertificateSelectorTest::CleanUpOnIOThread(); |
} |