Mark SessionHistoryTest.FrameBackForward flaky on Mac.

chrome/browser/session_history_uitest.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 128 matching lines @@
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"about:blank", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(L"bot3", GetTabTitle());
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MAC)

[Nico, 2011/12/01 16:50:31]

It's OS_MAXOSX, not OS_MAC. Since there are no complaints, maybe that can just
be removed? The bug is marked fixed, maybe it can be removed on win as well?

 // See http://crbug.com/61619
 #define MAYBE_FrameBackForward FLAKY_FrameBackForward
 #else
 #define MAYBE_FrameBackForward FrameBackForward
 #endif
 
 // Test that back/forward works when navigating in subframes.
 TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) {
   ASSERT_TRUE(test_server_.Start());
 
@@ skipping 400 matching lines @@
   ASSERT_TRUE(tab_->GoBack());
 
   // Ensure history.length is properly truncated.
   ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html")));
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace