| Index: chrome/browser/sync/test/integration/migration_errors_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
|
| index cf7cc1516bc022a8c55898e73052b6335d558c35..52bb6b5bc8119e2b4ddd565e6101dbb244eae2da 100644
|
| --- a/chrome/browser/sync/test/integration/migration_errors_test.cc
|
| +++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
|
| @@ -349,8 +349,9 @@ IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
|
|
|
| // Triggers a server migration on two datatypes, then makes a local
|
| // modification to one of them.
|
| +// Flaky. crbug.com/100382.
|
| IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
|
| - MigratePrefsAndBookmarksThenModifyBookmark) {
|
| + FLAKY_MigratePrefsAndBookmarksThenModifyBookmark) {
|
| RunTwoClientMigrationTest(
|
| MakeList(syncable::PREFERENCES, syncable::BOOKMARKS),
|
| MODIFY_BOOKMARK);
|
|
|