| Index: chrome/browser/sync/test/integration/migration_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
|
| index 1431e01c9b4125af9e9286e50ab7895e7a69895f..de8d7bd54b1989f01a8ac0370e983c52c32696db 100644
|
| --- a/chrome/browser/sync/test/integration/migration_test.cc
|
| +++ b/chrome/browser/sync/test/integration/migration_test.cc
|
| @@ -375,13 +375,25 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
|
| }
|
|
|
| // The whole shebang -- all data types.
|
| -IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) {
|
| +#if defined(OS_WIN)
|
| +// http://crbug.com/403778
|
| +#define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
|
| +#else
|
| +#define MAYBE_AllTypesIndividually AllTypesIndividually
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
|
| ASSERT_TRUE(SetupClients());
|
| RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
|
| }
|
|
|
| +#if defined(OS_WIN)
|
| +// http://crbug.com/403778
|
| +#define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividuallyTriggerNotification
|
| +#else
|
| +#define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTriggerNotification
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
|
| - AllTypesIndividuallyTriggerNotification) {
|
| + MAYBE_AllTypesIndividuallyTriggerNotification) {
|
| ASSERT_TRUE(SetupClients());
|
| RunSingleClientMigrationTest(GetPreferredDataTypesList(),
|
| TRIGGER_NOTIFICATION);
|
|
|