| 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 <memory> | 5 #include <memory> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 // Autofill wallet will be unready during this test, so we should not | 106 // Autofill wallet will be unready during this test, so we should not |
| 107 // request that it be migrated. | 107 // request that it be migrated. |
| 108 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA); | 108 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA); |
| 109 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA); | 109 preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA); |
| 110 | 110 |
| 111 // ARC package will be unready during this test, so we should not request | 111 // ARC package will be unready during this test, so we should not request |
| 112 // that it be migrated. | 112 // that it be migrated. |
| 113 preferred_data_types.Remove(syncer::ARC_PACKAGE); | 113 preferred_data_types.Remove(syncer::ARC_PACKAGE); |
| 114 | 114 |
| 115 // Doesn't make sense to migrate commit only types. |
| 116 preferred_data_types.RemoveAll(syncer::CommitOnlyTypes()); |
| 117 |
| 115 // Make sure all clients have the same preferred data types. | 118 // Make sure all clients have the same preferred data types. |
| 116 for (int i = 1; i < num_clients(); ++i) { | 119 for (int i = 1; i < num_clients(); ++i) { |
| 117 const syncer::ModelTypeSet other_preferred_data_types = | 120 const syncer::ModelTypeSet other_preferred_data_types = |
| 118 GetSyncService(i)->GetPreferredDataTypes(); | 121 GetSyncService(i)->GetPreferredDataTypes(); |
| 119 EXPECT_EQ(other_preferred_data_types, preferred_data_types); | 122 EXPECT_EQ(other_preferred_data_types, preferred_data_types); |
| 120 } | 123 } |
| 121 return preferred_data_types; | 124 return preferred_data_types; |
| 122 } | 125 } |
| 123 | 126 |
| 124 // Returns a MigrationList with every enabled data type in its own | 127 // Returns a MigrationList with every enabled data type in its own |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 // Do not add optional datatypes. | 431 // Do not add optional datatypes. |
| 429 } | 432 } |
| 430 | 433 |
| 431 ~MigrationReconfigureTest() override {} | 434 ~MigrationReconfigureTest() override {} |
| 432 | 435 |
| 433 private: | 436 private: |
| 434 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 437 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
| 435 }; | 438 }; |
| 436 | 439 |
| 437 } // namespace | 440 } // namespace |
| OLD | NEW |