| 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" | |
| 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 11 #include "chrome/browser/sync/test/integration/migration_waiter.h" | 10 #include "chrome/browser/sync/test/integration/migration_waiter.h" |
| 12 #include "chrome/browser/sync/test/integration/migration_watcher.h" | 11 #include "chrome/browser/sync/test/integration/migration_watcher.h" |
| 13 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 12 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
| 14 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 13 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 15 #include "chrome/browser/sync/test/integration/sync_test.h" | 14 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 16 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 16 #include "components/browser_sync/browser/profile_sync_service.h" |
| 17 #include "components/translate/core/browser/translate_prefs.h" | 17 #include "components/translate/core/browser/translate_prefs.h" |
| 18 | 18 |
| 19 using bookmarks_helper::AddURL; | 19 using bookmarks_helper::AddURL; |
| 20 using bookmarks_helper::IndexedURL; | 20 using bookmarks_helper::IndexedURL; |
| 21 using bookmarks_helper::IndexedURLTitle; | 21 using bookmarks_helper::IndexedURLTitle; |
| 22 | 22 |
| 23 using preferences_helper::BooleanPrefMatches; | 23 using preferences_helper::BooleanPrefMatches; |
| 24 using preferences_helper::ChangeBooleanPref; | 24 using preferences_helper::ChangeBooleanPref; |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 // Do not add optional datatypes. | 422 // Do not add optional datatypes. |
| 423 } | 423 } |
| 424 | 424 |
| 425 ~MigrationReconfigureTest() override {} | 425 ~MigrationReconfigureTest() override {} |
| 426 | 426 |
| 427 private: | 427 private: |
| 428 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 428 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
| 429 }; | 429 }; |
| 430 | 430 |
| 431 } // namespace | 431 } // namespace |
| OLD | NEW |