| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| ===================================================================
|
| --- chrome/browser/ssl/ssl_browser_tests.cc (revision 98481)
|
| +++ chrome/browser/ssl/ssl_browser_tests.cc (working copy)
|
| @@ -48,7 +48,8 @@
|
| ASSERT_TRUE(entry);
|
| EXPECT_EQ(NORMAL_PAGE, entry->page_type());
|
| EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->ssl().security_style());
|
| - EXPECT_EQ(0, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
|
| + EXPECT_EQ(net::CERT_STATUS_NO_ERROR,
|
| + entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
|
| EXPECT_EQ(displayed_insecure_content,
|
| entry->ssl().displayed_insecure_content());
|
| EXPECT_FALSE(entry->ssl().ran_insecure_content());
|
| @@ -59,13 +60,14 @@
|
| ASSERT_TRUE(entry);
|
| EXPECT_EQ(NORMAL_PAGE, entry->page_type());
|
| EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->ssl().security_style());
|
| - EXPECT_EQ(0, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
|
| + EXPECT_EQ(net::CERT_STATUS_NO_ERROR,
|
| + entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
|
| EXPECT_FALSE(entry->ssl().displayed_insecure_content());
|
| EXPECT_FALSE(entry->ssl().ran_insecure_content());
|
| }
|
|
|
| void CheckAuthenticationBrokenState(TabContents* tab,
|
| - int error,
|
| + net::CertStatus error,
|
| bool ran_insecure_content,
|
| bool interstitial) {
|
| NavigationEntry* entry = tab->controller().GetActiveEntry();
|
|
|