OLD | NEW |
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 // Supervised user data types will be "unready" during this test, so we | 98 // Supervised user data types will be "unready" during this test, so we |
99 // should not request that they be migrated. | 99 // should not request that they be migrated. |
100 preferred_data_types.Remove(syncer::SUPERVISED_USER_SETTINGS); | 100 preferred_data_types.Remove(syncer::SUPERVISED_USER_SETTINGS); |
101 preferred_data_types.Remove(syncer::SUPERVISED_USER_WHITELISTS); | 101 preferred_data_types.Remove(syncer::SUPERVISED_USER_WHITELISTS); |
102 | 102 |
103 // Autofill wallet will be unready during this test, so we should not | 103 // Autofill wallet will be unready during this test, so we should not |
104 // request that it be migrated. | 104 // request that it be migrated. |
105 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA); | 105 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA); |
106 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA); | 106 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA); |
107 | 107 |
108 // Arc package will be unready during this test, so we should not request | 108 // ARC package will be unready during this test, so we should not request |
109 // that it be migrated. | 109 // that it be migrated. |
110 preferred_data_types.Remove(syncer::ARC_PACKAGE); | 110 preferred_data_types.Remove(syncer::ARC_PACKAGE); |
111 | 111 |
112 // Make sure all clients have the same preferred data types. | 112 // Make sure all clients have the same preferred data types. |
113 for (int i = 1; i < num_clients(); ++i) { | 113 for (int i = 1; i < num_clients(); ++i) { |
114 const syncer::ModelTypeSet other_preferred_data_types = | 114 const syncer::ModelTypeSet other_preferred_data_types = |
115 GetSyncService(i)->GetPreferredDataTypes(); | 115 GetSyncService(i)->GetPreferredDataTypes(); |
116 EXPECT_EQ(other_preferred_data_types, preferred_data_types); | 116 EXPECT_EQ(other_preferred_data_types, preferred_data_types); |
117 } | 117 } |
118 return preferred_data_types; | 118 return preferred_data_types; |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 // Do not add optional datatypes. | 425 // Do not add optional datatypes. |
426 } | 426 } |
427 | 427 |
428 ~MigrationReconfigureTest() override {} | 428 ~MigrationReconfigureTest() override {} |
429 | 429 |
430 private: | 430 private: |
431 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 431 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
432 }; | 432 }; |
433 | 433 |
434 } // namespace | 434 } // namespace |
OLD | NEW |