chrome/browser/ssl/ssl_browser_tests.cc - Issue 1317593002: Have SSLErrorHandler decide which type of interstitial to display

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 1317593002: Have SSLErrorHandler decide which type of interstitial to display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix browser tests Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ssl/ssl_blocking_page.cc ('K') | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/ssl/ssl_error_classification.h » ('j') | chrome/browser/ssl/ssl_error_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 451d4d00fed9ad2dd26ac4bd73f1a0bc8c50ce5d..3b8d94baf9cd311fe4fe335e491222c4f83321ad 100644

--- a/chrome/browser/ssl/ssl_browser_tests.cc

+++ b/chrome/browser/ssl/ssl_browser_tests.cc

@@ -14,6 +14,7 @@

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "base/test/histogram_tester.h"

+#include "base/test/simple_test_clock.h"

#include "base/thread_task_runner_handle.h"

#include "base/time/time.h"

#include "chrome/app/chrome_command_ids.h"

@@ -22,6 +23,7 @@

#include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"

#include "chrome/browser/net/certificate_error_reporter.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/ssl/bad_clock_blocking_page.h"

#include "chrome/browser/ssl/cert_logger.pb.h"

#include "chrome/browser/ssl/cert_report_helper.h"

#include "chrome/browser/ssl/cert_verifier_browser_test.h"

@@ -779,6 +781,22 @@ IN_PROC_BROWSER_TEST_F(SSLUITestIgnoreLocalhostCertErrors,

EXPECT_EQ(title, expected_title);

}

+// The build time is only available reliably on official builds.

estark 2015/09/01 13:28:28 Can you explain this comment more? It seems like a

felt 2015/09/01 15:49:41 Ah this was an oversight, I used to have the test

+IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorCausedByClock) {

+ ASSERT_TRUE(https_server_expired_.Start());

+ scoped_ptr<base::SimpleTestClock> mock_clock(new base::SimpleTestClock());

+ mock_clock->SetNow(base::Time::NowFromSystemTime());

+ mock_clock->Advance(base::TimeDelta::FromDays(367));

+ SSLErrorHandler::SetClockForTest(mock_clock.get());

+ ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("/"));

+ WebContents* clock_tab = browser()->tab_strip_model()->GetActiveWebContents();

+ content::WaitForInterstitialAttach(clock_tab);

+ InterstitialPage* clock_interstitial = clock_tab->GetInterstitialPage();

+ ASSERT_TRUE(clock_interstitial);

+ ASSERT_EQ(BadClockBlockingPage::kTypeForTesting,

estark 2015/09/01 13:28:28 nit: This should probably be EXPECT_EQ.

felt 2015/09/01 15:49:41 Done.

+ clock_interstitial->GetDelegateForTesting()->GetTypeForTesting());

// Visits a page with https error and then goes back using Browser::GoBack.

IN_PROC_BROWSER_TEST_F(SSLUITest,

TestHTTPSExpiredCertAndGoBackViaButton) {