Mark BrowserActionApiTest.BrowserActionPopup flaky.

chrome/browser/extensions/browser_action_apitest.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 125 matching lines @@
 
   // Go back to first tab, changed title should reappear.
   browser()->SelectTabContentsAt(0, true);
   EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0));
 
   // Reload that tab, default title should come back.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0));
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) {
+// http://code.google.com/p/chromium/issues/detail?id=70829
+// Only mac is okay.
+#if !defined(OS_MACOSX)
+#define MAYBE_BrowserActionPopup FLAKY_BrowserActionPopup
+#else
+#define MAYBE_BrowserActionPopup BrowserActionPopup
+#endif
+IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_BrowserActionPopup) {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "browser_action/popup")));
   BrowserActionTestUtil actions_bar = GetBrowserActionsBar();
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // The extension's popup's size grows by |growFactor| each click.
   const int growFactor = 500;
   gfx::Size minSize = BrowserActionTestUtil::GetMinPopupSize();
   gfx::Size middleSize = gfx::Size(growFactor, growFactor);
@@ skipping 205 matching lines @@
   service->toolbar_model()->MoveBrowserAction(
       service->extensions()->at(size_before + 1), 1);
 
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1));
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(2));
 
   EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0));
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
 }