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 22 matching lines...) Expand all Loading... |
33 return syncer::ModelTypeSet(type); | 33 return syncer::ModelTypeSet(type); |
34 } | 34 } |
35 | 35 |
36 syncer::ModelTypeSet MakeSet(syncer::ModelType type1, | 36 syncer::ModelTypeSet MakeSet(syncer::ModelType type1, |
37 syncer::ModelType type2) { | 37 syncer::ModelType type2) { |
38 return syncer::ModelTypeSet(type1, type2); | 38 return syncer::ModelTypeSet(type1, type2); |
39 } | 39 } |
40 | 40 |
41 // An ordered list of model types sets to migrate. Used by | 41 // An ordered list of model types sets to migrate. Used by |
42 // RunMigrationTest(). | 42 // RunMigrationTest(). |
43 typedef std::deque<syncer::ModelTypeSet> MigrationList; | 43 using MigrationList = std::deque<syncer::ModelTypeSet>; |
44 | 44 |
45 // Utility functions to make a MigrationList out of a small number of | 45 // Utility functions to make a MigrationList out of a small number of |
46 // model types / model type sets. | 46 // model types / model type sets. |
47 | 47 |
48 MigrationList MakeList(syncer::ModelTypeSet model_types) { | 48 MigrationList MakeList(syncer::ModelTypeSet model_types) { |
49 return MigrationList(1, model_types); | 49 return MigrationList(1, model_types); |
50 } | 50 } |
51 | 51 |
52 MigrationList MakeList(syncer::ModelTypeSet model_types1, | 52 MigrationList MakeList(syncer::ModelTypeSet model_types1, |
53 syncer::ModelTypeSet model_types2) { | 53 syncer::ModelTypeSet model_types2) { |
(...skipping 371 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 |