Moving two tests to FLAKY tests.

 TestHTTPSErrorWithNoNavEntry: fails differently on 32 and 64 bits due to timing issue. (We thought it's deterinistic, but this is apparently not)
 FindDisappearOnNavigate: due to asynchronous-ness on x11.

BUG=28629,28098
TEST=build and run browser_tests in 64bit.

Review URL: http://codereview.chromium.org/438010

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

3 files changed, 17 insertions, 3 deletions

diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 1266be8..e624856 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -224,7 +224,15 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) {
 // 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();
@@ -249,9 +257,6 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) {
   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
diff --git a/chrome/browser/views/find_bar_host.cc b/chrome/browser/views/find_bar_host.cc
index 9b2cda5..dd8622a 100644
--- a/chrome/browser/views/find_bar_host.cc
+++ b/chrome/browser/views/find_bar_host.cc
@@ -117,6 +117,8 @@ bool FindBarHost::GetFindBarWindowInfo(gfx::Point* position,
 #else
       false) {
       // TODO(sky): figure out linux side.
+      // This is tricky due to asynchronous nature of x11.
+      // See bug http://crbug.com/28629.
 #endif
     if (position)
       *position = gfx::Point();
diff --git a/chrome/browser/views/find_bar_host_browsertest.cc b/chrome/browser/views/find_bar_host_browsertest.cc
index 94a586e..383ebe5 100644
--- a/chrome/browser/views/find_bar_host_browsertest.cc
+++ b/chrome/browser/views/find_bar_host_browsertest.cc
@@ -471,7 +471,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
 }
 
 // Make sure Find box disappears on Navigate but not on Refresh.
+#if defined(OS_LINUX)
+// The last EXPECT_FALSE(fully_visible) is flaky (especially on
+// 64bit build.). See bug http://crbug.com/28629.
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
+                       FLAKY_FindDisappearOnNavigate) {
+#else
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) {
+#endif
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our special focus tracking page.