diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 17:24:35 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 17:24:35 +0000 |
| commit | 51f41da1d34453cd1ec96a625df8cbc94cf65865 (patch) | |
| tree | fecaebbaf9acc6fa658f7fb0e558b876c8cfcb70 /chrome/browser/extensions/extension_toolbar_model_browsertest.cc | |
| parent | 5a992e9cc29dabab761193bbbec07c8c40a80acc (diff) | |
| download | chromium_src-51f41da1d34453cd1ec96a625df8cbc94cf65865.zip chromium_src-51f41da1d34453cd1ec96a625df8cbc94cf65865.tar.gz chromium_src-51f41da1d34453cd1ec96a625df8cbc94cf65865.tar.bz2 | |
ExtensionToolbarModelTest.ReorderAndReinsert is flaky on Blink Mac canaries
BUG=166580
TBR=finnur@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/34623017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_toolbar_model_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc index a1d4037..4b3d734 100644 --- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc +++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc @@ -107,7 +107,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, Basic) { EXPECT_EQ(NULL, ExtensionAt(0)); } -IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, ReorderAndReinsert) { +#if defined(OS_MACOSX) +// Flaky on Mac 10.8 Blink canary bots: http://crbug.com/166580 +#define MAYBE_ReorderAndReinsert DISABLED_ReorderAndReinsert +#else +#define MAYBE_ReorderAndReinsert ReorderAndReinsert +#endif +IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, MAYBE_ReorderAndReinsert) { // Load an extension with a browser action. base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test") .AppendASCII("browser_action") |