Re-enable SSLUITest.TestGoodFrameNavigation and adjust to new behaviour now

chrome/browser/ssl/ssl_browser_tests.cc

Index: chrome/browser/ssl/ssl_browser_tests.cc
===================================================================
--- chrome/browser/ssl/ssl_browser_tests.cc	(revision 201401)
+++ chrome/browser/ssl/ssl_browser_tests.cc	(working copy)
@@ -1291,7 +1291,7 @@
 // - navigate to a bad HTTPS (expect unsafe content and filtered frame), then
 //   back
 // - navigate to HTTP (expect insecure content), then back
-IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
@@ -1376,8 +1376,8 @@
     observer.Wait();
   }
 
-  // Our state should be insecure.
-  CheckAuthenticatedState(tab, true);
+  // Our state should be unathenticated (in the ran mixed script sense)
+  CheckUnauthenticatedState(tab);

[Lei Zhang, 2013/05/29 20:06:34]

How does this compile correctly when CheckAuthenticatedState() takes 2
parameters?

 
   // Go back, our state should be unchanged.
   {
@@ -1387,7 +1387,7 @@
     tab->GetController().GoBack();
     observer.Wait();
   }
-  CheckAuthenticatedState(tab, true);
+  CheckUnauthenticatedState(tab);
 }
 
 // From a bad HTTPS top frame: