| 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/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
| 7 #include "base/prefs/scoped_user_pref_update.h" | 7 #include "base/prefs/scoped_user_pref_update.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sync/profile_sync_service.h" | 9 #include "chrome/browser/sync/profile_sync_service.h" |
| 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 preferred_data_types.RemoveAll(syncer::ProxyTypes()); | 96 preferred_data_types.RemoveAll(syncer::ProxyTypes()); |
| 97 | 97 |
| 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 | 107 |
| 107 // Make sure all clients have the same preferred data types. | 108 // Make sure all clients have the same preferred data types. |
| 108 for (int i = 1; i < num_clients(); ++i) { | 109 for (int i = 1; i < num_clients(); ++i) { |
| 109 const syncer::ModelTypeSet other_preferred_data_types = | 110 const syncer::ModelTypeSet other_preferred_data_types = |
| 110 GetSyncService((i))->GetPreferredDataTypes(); | 111 GetSyncService((i))->GetPreferredDataTypes(); |
| 111 EXPECT_TRUE(preferred_data_types.Equals(other_preferred_data_types)); | 112 EXPECT_TRUE(preferred_data_types.Equals(other_preferred_data_types)); |
| 112 } | 113 } |
| 113 return preferred_data_types; | 114 return preferred_data_types; |
| 114 } | 115 } |
| 115 | 116 |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 // Do not add optional datatypes. | 422 // Do not add optional datatypes. |
| 422 } | 423 } |
| 423 | 424 |
| 424 ~MigrationReconfigureTest() override {} | 425 ~MigrationReconfigureTest() override {} |
| 425 | 426 |
| 426 private: | 427 private: |
| 427 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 428 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
| 428 }; | 429 }; |
| 429 | 430 |
| 430 } // namespace | 431 } // namespace |
| OLD | NEW |