| 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 569a570c9861136b14b4de3e8655f5c4dfaf3fc4..c13d953276837051f8d77ada534a9c211f9c7cb2 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -82,7 +82,7 @@ class ProvisionalLoadWaiter : public content::WebContentsObserver {
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& validated_url,
|
| int error_code,
|
| - const base::string16& error_description) OVERRIDE {
|
| + const base::string16& error_description) override {
|
| seen_ = true;
|
| if (waiting_)
|
| base::MessageLoopForUI::current()->Quit();
|
| @@ -187,7 +187,7 @@ class SSLUITest : public InProcessBrowserTest {
|
| SSLOptions(SSLOptions::CERT_EXPIRED),
|
| net::GetWebSocketTestDataDirectory()) {}
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| // Browser will both run and display insecure content.
|
| command_line->AppendSwitch(switches::kAllowRunningInsecureContent);
|
| // Use process-per-site so that navigating to a same-site page in a
|
| @@ -365,7 +365,7 @@ class SSLUITestBlock : public SSLUITest {
|
| SSLUITestBlock() : SSLUITest() {}
|
|
|
| // Browser will neither run nor display insecure content.
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| command_line->AppendSwitch(switches::kNoDisplayingInsecureContent);
|
| }
|
| };
|
| @@ -374,7 +374,7 @@ class SSLUITestIgnoreCertErrors : public SSLUITest {
|
| public:
|
| SSLUITestIgnoreCertErrors() : SSLUITest() {}
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| // Browser will ignore certificate errors.
|
| command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
|
| }
|
| @@ -736,7 +736,7 @@ class SSLUITestWithClientCert : public SSLUITest {
|
| public:
|
| SSLUITestWithClientCert() : cert_db_(NULL) {}
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| SSLUITest::SetUpOnMainThread();
|
|
|
| base::RunLoop loop;
|
|
|