| 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 247ae913a5743c43c648d48a0fe6a0a9f37107bb..2e35b58d51cc9ed182282ec09e2feca6176c427e 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -38,7 +38,7 @@ class SSLUITest : public InProcessBrowserTest {
|
| bool displayed_insecure_content) {
|
| NavigationEntry* entry = tab->controller().GetActiveEntry();
|
| ASSERT_TRUE(entry);
|
| - EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry->page_type());
|
| + 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(displayed_insecure_content,
|
| @@ -49,7 +49,7 @@ class SSLUITest : public InProcessBrowserTest {
|
| void CheckUnauthenticatedState(TabContents* tab) {
|
| NavigationEntry* entry = tab->controller().GetActiveEntry();
|
| ASSERT_TRUE(entry);
|
| - EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry->page_type());
|
| + 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_FALSE(entry->ssl().displayed_insecure_content());
|
| @@ -62,8 +62,7 @@ class SSLUITest : public InProcessBrowserTest {
|
| bool interstitial) {
|
| NavigationEntry* entry = tab->controller().GetActiveEntry();
|
| ASSERT_TRUE(entry);
|
| - EXPECT_EQ(interstitial ? NavigationEntry::INTERSTITIAL_PAGE :
|
| - NavigationEntry::NORMAL_PAGE,
|
| + EXPECT_EQ(interstitial ? INTERSTITIAL_PAGE : NORMAL_PAGE,
|
| entry->page_type());
|
| EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN,
|
| entry->ssl().security_style());
|
|
|