Add constructor to create SSLStatus from SSLInfo

chrome/browser/ssl/ssl_browser_tests.cc

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 465d7ab86bd8de73a92f5a000bc5d94a97a1a100..c7071ed07eb503a9659a22aeea940b5a6b75dafd 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -2354,6 +2354,31 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, BadCertFollowedByGoodCert) {
   EXPECT_FALSE(state->HasAllowException(https_server_host));
 }
 
+// Tests that the SSLStatus of a navigation entry for an interstitial
+// matches the navigation entry once the interstitial is clicked
+// through. https://crbug.com/529456
+IN_PROC_BROWSER_TEST_F(SSLUITest,
+                       SSLStatusMatchesOnInterstitialAndAfterProceed) {
+  ASSERT_TRUE(https_server_expired_.Start());
+  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ui_test_utils::NavigateToURL(
+      browser(), https_server_expired_.GetURL("files/ssl/google.html"));
+

[meacer, 2015/09/08 22:19:39]

I think you should do a WaitForInterstitialAttach here, otherwise the test might
be flaky. Same goes for other tests in this file, but no need to worry about
them for now.

[estark, 2015/09/08 22:53:59]

Done.

+  ASSERT_TRUE(tab);
+  EXPECT_TRUE(tab->ShowingInterstitialPage());
+  content::NavigationEntry* entry = tab->GetController().GetActiveEntry();
+  ASSERT_TRUE(entry);
+  content::SSLStatus interstitial_ssl_status = entry->GetSSL();
+
+  ProceedThroughInterstitial(tab);
+  EXPECT_FALSE(tab->ShowingInterstitialPage());
+  entry = tab->GetController().GetActiveEntry();
+  ASSERT_TRUE(entry);
+  content::SSLStatus after_interstitial_ssl_status = entry->GetSSL();
+

[meacer, 2015/09/08 22:19:39]

nit: Remove blank line, or move it above the previous line so that
after_interstitial_ssl_status code is grouped.

[estark, 2015/09/08 22:53:59]

Done.

+  EXPECT_TRUE(interstitial_ssl_status.Equals(after_interstitial_ssl_status));
+}
+
 class CommonNameMismatchBrowserTest : public CertVerifierBrowserTest {
  public:
   CommonNameMismatchBrowserTest() : CertVerifierBrowserTest() {}