Moving two tests to FLAKY tests.

chrome/browser/ssl/ssl_browser_tests.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/time.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 206 matching lines @@
   // Try to navigate to a new page. (to make sure bug 5800 is fixed).
   ui_test_utils::NavigateToURL(browser(),
       http_server->TestServerPageW(L"files/ssl/google.html"));
   CheckUnauthenticatedState(tab);
 }
 
 // Open a page with a HTTPS error in a tab with no prior navigation (through a
 // link with a blank target).  This is to test that the lack of navigation entry
 // does not cause any problems (it was causing a crasher, see
 // http://crbug.com/19941).
+#if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS)
 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) {
+#else
+// TODO(jcampan|oshima): On linux/views, the WaitForLoadStop call
+// below sometimes waits forever because LOAD_STOP notification can
+// happen before WaitLorLoadStop is called. Marking this test as Fleaky.
+// See http://crbug/28098.
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSErrorWithNoNavEntry) {
+#endif
   scoped_refptr<HTTPTestServer> http_server = PlainServer();
   ASSERT_TRUE(http_server.get() != NULL);
   scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
   ASSERT_TRUE(bad_https_server.get() != NULL);
 
   // Load a page with a link that opens a new window (therefore with no history
   // and no navigation entries).
   ui_test_utils::NavigateToURL(browser(), http_server->TestServerPageW(
       L"files/ssl/page_with_blank_target.html"));
 
   bool success = false;
   // Simulate clicking the link (and therefore navigating to that new page).
   // This will causes a new tab to be created.
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       browser()->GetSelectedTabContents()->render_view_host(), L"",
       L"window.domAutomationController.send(navigateInNewTab());",
       &success));
   EXPECT_TRUE(success);
 
   // By the time we got a response, the new tab should have been created and be
   // the selected tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
 
-  // TODO(jcampan|oshima): Following code waits forever on linux/views
-  // because LOAD_STOP notification is issued before WaitLorLoadStop
-  // is called. See http://crbug/28098.
 #if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS)
   // Since the navigation was initiated by the renderer (when we clicked on the
   // link) and since the main page network request failed, we won't get a
   // navigation entry committed.  So we'll just wait for the load to stop.
   ui_test_utils::WaitForLoadStop(
       &(browser()->GetSelectedTabContents()->controller()));
 #endif
 
   // We should have an interstitial page showing.
   ASSERT_TRUE(browser()->GetSelectedTabContents()->interstitial_page());
@@ skipping 591 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest mixed in synchronous mode.
 
 // XMLHttpRequest mixed in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.