| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index c501810ad8de7d24ae30355947d8d240c5b7b84f..6d50c0b8c6ad91cf02664afd086581b5cd3e6d11 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -36,6 +36,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| +#include "chrome/browser/ui/browser_navigator_params.h"
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/chrome_paths.h"
|
| @@ -1104,28 +1105,28 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMarkNonSecureAs) {
|
|
|
| #if defined(USE_NSS_CERTS)
|
| class SSLUITestWithClientCert : public SSLUITest {
|
| - public:
|
| - SSLUITestWithClientCert() : cert_db_(NULL) {}
|
| -
|
| - void SetUpOnMainThread() override {
|
| - SSLUITest::SetUpOnMainThread();
|
| -
|
| - base::RunLoop loop;
|
| - GetNSSCertDatabaseForProfile(
|
| - browser()->profile(),
|
| - base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
|
| - base::Unretained(this),
|
| - &loop));
|
| - loop.Run();
|
| - }
|
| -
|
| - protected:
|
| - void DidGetCertDatabase(base::RunLoop* loop, net::NSSCertDatabase* cert_db) {
|
| - cert_db_ = cert_db;
|
| - loop->Quit();
|
| - }
|
| -
|
| - net::NSSCertDatabase* cert_db_;
|
| + public:
|
| + SSLUITestWithClientCert() : cert_db_(NULL) {}
|
| +
|
| + void SetUpOnMainThread() override {
|
| + SSLUITest::SetUpOnMainThread();
|
| +
|
| + base::RunLoop loop;
|
| + GetNSSCertDatabaseForProfile(
|
| + browser()->profile(),
|
| + base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
|
| + base::Unretained(this),
|
| + &loop));
|
| + loop.Run();
|
| + }
|
| +
|
| + protected:
|
| + void DidGetCertDatabase(base::RunLoop* loop, net::NSSCertDatabase* cert_db) {
|
| + cert_db_ = cert_db;
|
| + loop->Quit();
|
| + }
|
| +
|
| + net::NSSCertDatabase* cert_db_;
|
| };
|
|
|
| // SSL client certificate tests are only enabled when using NSS for private key
|
|
|