| Index: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
|
| index 7fb554c8ec06630e1fe065c064f99bf1f74a6d84..c9a77e8890b83a48ed628bc55ad379d4151d9dba 100644
|
| --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
|
| @@ -830,8 +830,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOf10BMs) {
|
| }
|
|
|
| // Test Scribe ID - 371954.
|
| +// flaky on Windows: http://crbug.com/412169
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_SC_MovingBMsFromBMBarToBMFolder DISABLED_SC_MovingBMsFromBMBarToBMFolder
|
| +#else
|
| +#define MAYBE_SC_MovingBMsFromBMBarToBMFolder SC_MovingBMsFromBMBarToBMFolder
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
|
| - SC_MovingBMsFromBMBarToBMFolder) {
|
| + MAYBE_SC_MovingBMsFromBMBarToBMFolder) {
|
| ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
|
| ASSERT_TRUE(AllModelsMatchVerifier());
|
|
|
| @@ -857,8 +863,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
|
| }
|
|
|
| // Test Scribe ID - 371957.
|
| +// flaky on Windows: http://crbug.com/412169
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_SC_MovingBMsFromBMFoldToBMBar DISABLED_SC_MovingBMsFromBMFoldToBMBar
|
| +#else
|
| +#define MAYBE_SC_MovingBMsFromBMFoldToBMBar SC_MovingBMsFromBMFoldToBMBar
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
|
| - SC_MovingBMsFromBMFoldToBMBar) {
|
| + MAYBE_SC_MovingBMsFromBMFoldToBMBar) {
|
| ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
|
| ASSERT_TRUE(AllModelsMatchVerifier());
|
|
|
|
|