Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1130)

Unified Diff: chrome/browser/sync/test/integration/migration_test.cc

Issue 2250753002: arc: Fix ArcPackageSyncableService initialization issue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b5d841ef41b70f932d5f0af67822d8977b3f5c5e..f41b940a99402f6100dfd75e228a135141221e8d 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -106,6 +106,10 @@ class MigrationTest : public SyncTest {
preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA);
preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA);
+ // Arc package will be unready during this test, so we should not request
+ // that it be migrated.
+ preferred_data_types.Remove(syncer::ARC_PACKAGE);
+
// Make sure all clients have the same preferred data types.
for (int i = 1; i < num_clients(); ++i) {
const syncer::ModelTypeSet other_preferred_data_types =
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.cc ('k') | chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698