Removing a now irrelevant browser test and disabling 2 failing ones (in order to be able to run browser tests on the main build bots).

BUG=None
TEST=Run the SSL browser tests
Review URL: http://codereview.chromium.org/146039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19038 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 56 deletions

diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 0c36fd6..8f0eb49 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -195,58 +195,6 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContents) {
                           true /* mixed-content */, false);
 }
 
-// Visits a page with mixed content.
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsFilterAll) {
-  scoped_refptr<HTTPSTestServer> https_server = GoodCertServer();
-  scoped_refptr<HTTPTestServer> http_server = PlainServer();
-
-  // Set the "block mixed-content" preference.
-  browser()->profile()->GetPrefs()->SetInteger(prefs::kMixedContentFiltering,
-                                               FilterPolicy::FILTER_ALL);
-
-  // Load a page with mixed-content, the mixed content shouldn't load.
-  ui_test_utils::NavigateToURL(browser(), https_server->TestServerPageW(
-      L"files/ssl/page_with_mixed_contents.html"));
-
-  TabContents* tab = browser()->GetSelectedTabContents();
-  NavigationEntry* entry = tab->controller().GetActiveEntry();
-  ASSERT_TRUE(entry);
-  EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry->page_type());
-
-  // The image should be filtered.
-  int img_width = 0;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      tab, L"", L"window.domAutomationController.send(ImageWidth());",
-      &img_width));
-  // In order to check that the image was not loaded, we check its width.
-  // The actual image (Google logo) is 114 pixels wide, we assume the broken
-  // image is less than 100.
-  EXPECT_GT(100, img_width);
-
-  // The state should be OK since we are not showing the resource.
-  CheckAuthenticatedState(tab, false, false);
-
-  // There should be one info-bar to show the mixed-content.
-  EXPECT_EQ(1, tab->infobar_delegate_count());
-
-  // Activate the link on the info-bar to show the mixed-content.
-  InfoBarDelegate* delegate = tab->GetInfoBarDelegateAt(0);
-  ASSERT_TRUE(delegate->AsConfirmInfoBarDelegate());
-  delegate->AsConfirmInfoBarDelegate()->Accept();
-  // Showing the mixed-contents triggered a page reload, let's wait for it to
-  // finish.
-  ui_test_utils::WaitForNavigation(&(tab->controller()));
-
-  // The image should show now.
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      tab, L"", L"window.domAutomationController.send(ImageWidth());",
-      &img_width));
-  EXPECT_LT(100, img_width);
-
-  // And our status should be mixed-content.
-  CheckAuthenticatedState(tab, true /* mixed-content */, false);
-}
-
 // Visits a page with an http script that tries to suppress our mixed content
 // warnings by randomize location.hash.
 // Based on http://crbug.com/8706
@@ -323,7 +271,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) {
 // Visits two pages from the same origin: one with mixed content and one
 // without.  The test checks that we propagate the mixed content state from one
 // to the other.
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsTwoTabs) {
+// TODO(jcampan): http://crbug.com/15072 this test fails.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestMixedContentsTwoTabs) {
   scoped_refptr<HTTPSTestServer> https_server = GoodCertServer();
   scoped_refptr<HTTPTestServer> http_server = PlainServer();
 
@@ -453,9 +402,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) {
                                  false);  // No interstitial showing.
 }
 
-// Tests that closing a page that has a unsafe pop-up does not crash the browser
-// (bug #1966).
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestCloseTabWithUnsafePopup) {
+// Tests that closing a page that has a unsafe pop-up does not crash the
+// browser (bug #1966).
+// TODO(jcampan): http://crbug.com/2136 disabled because the popup is not
+//                opened as it is not initiated by a user gesture.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
   scoped_refptr<HTTPTestServer> http_server = PlainServer();
   scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();