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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/scoped_vector.h" 7 #include "base/memory/scoped_vector.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
10 #include "chrome/browser/sync/test/integration/migration_waiter.h" 10 #include "chrome/browser/sync/test/integration/migration_waiter.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // Supervised user data types will be "unready" during this test, so we 99 // Supervised user data types will be "unready" during this test, so we
100 // should not request that they be migrated. 100 // should not request that they be migrated.
101 preferred_data_types.Remove(syncer::SUPERVISED_USER_SETTINGS); 101 preferred_data_types.Remove(syncer::SUPERVISED_USER_SETTINGS);
102 preferred_data_types.Remove(syncer::SUPERVISED_USER_WHITELISTS); 102 preferred_data_types.Remove(syncer::SUPERVISED_USER_WHITELISTS);
103 103
104 // Autofill wallet will be unready during this test, so we should not 104 // Autofill wallet will be unready during this test, so we should not
105 // request that it be migrated. 105 // request that it be migrated.
106 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA); 106 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA);
107 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA); 107 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA);
108 108
109 // Arc package will be unready during this test, so we should not request
110 // that it be migrated.
111 preferred_data_types.Remove(syncer::ARC_PACKAGE);
112
109 // Make sure all clients have the same preferred data types. 113 // Make sure all clients have the same preferred data types.
110 for (int i = 1; i < num_clients(); ++i) { 114 for (int i = 1; i < num_clients(); ++i) {
111 const syncer::ModelTypeSet other_preferred_data_types = 115 const syncer::ModelTypeSet other_preferred_data_types =
112 GetSyncService((i))->GetPreferredDataTypes(); 116 GetSyncService((i))->GetPreferredDataTypes();
113 EXPECT_EQ(other_preferred_data_types, preferred_data_types); 117 EXPECT_EQ(other_preferred_data_types, preferred_data_types);
114 } 118 }
115 return preferred_data_types; 119 return preferred_data_types;
116 } 120 }
117 121
118 // Returns a MigrationList with every enabled data type in its own 122 // Returns a MigrationList with every enabled data type in its own
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 // Do not add optional datatypes. 427 // Do not add optional datatypes.
424 } 428 }
425 429
426 ~MigrationReconfigureTest() override {} 430 ~MigrationReconfigureTest() override {}
427 431
428 private: 432 private:
429 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); 433 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
430 }; 434 };
431 435
432 } // namespace 436 } // namespace
OLDNEW
« 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