Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1493)

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <limits> 10 #include <limits>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/tabs/tab_strip_model.h" 51 #include "chrome/browser/ui/tabs/tab_strip_model.h"
52 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 52 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
53 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 53 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
54 #include "chrome/common/chrome_constants.h" 54 #include "chrome/common/chrome_constants.h"
55 #include "chrome/common/chrome_paths.h" 55 #include "chrome/common/chrome_paths.h"
56 #include "chrome/common/chrome_switches.h" 56 #include "chrome/common/chrome_switches.h"
57 #include "chrome/test/base/search_test_utils.h" 57 #include "chrome/test/base/search_test_utils.h"
58 #include "chrome/test/base/testing_browser_process.h" 58 #include "chrome/test/base/testing_browser_process.h"
59 #include "chrome/test/base/ui_test_utils.h" 59 #include "chrome/test/base/ui_test_utils.h"
60 #include "components/bookmarks/test/bookmark_test_helpers.h" 60 #include "components/bookmarks/test/bookmark_test_helpers.h"
61 #include "components/browser_sync/browser/profile_sync_service.h" 61 #include "components/browser_sync/profile_sync_service.h"
62 #include "components/google/core/browser/google_url_tracker.h" 62 #include "components/google/core/browser/google_url_tracker.h"
63 #include "components/invalidation/impl/invalidation_switches.h" 63 #include "components/invalidation/impl/invalidation_switches.h"
64 #include "components/invalidation/impl/p2p_invalidation_service.h" 64 #include "components/invalidation/impl/p2p_invalidation_service.h"
65 #include "components/invalidation/impl/p2p_invalidator.h" 65 #include "components/invalidation/impl/p2p_invalidator.h"
66 #include "components/invalidation/impl/profile_invalidation_provider.h" 66 #include "components/invalidation/impl/profile_invalidation_provider.h"
67 #include "components/invalidation/public/invalidation_service.h" 67 #include "components/invalidation/public/invalidation_service.h"
68 #include "components/keyed_service/core/keyed_service.h" 68 #include "components/keyed_service/core/keyed_service.h"
69 #include "components/os_crypt/os_crypt_mocker.h" 69 #include "components/os_crypt/os_crypt_mocker.h"
70 #include "components/search_engines/template_url_service.h" 70 #include "components/search_engines/template_url_service.h"
71 #include "components/signin/core/browser/profile_identity_provider.h" 71 #include "components/signin/core/browser/profile_identity_provider.h"
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 1131
1132 void SyncTest::TriggerSyncForModelTypes(int index, 1132 void SyncTest::TriggerSyncForModelTypes(int index,
1133 syncer::ModelTypeSet model_types) { 1133 syncer::ModelTypeSet model_types) {
1134 GetSyncService(index)->TriggerRefresh(model_types); 1134 GetSyncService(index)->TriggerRefresh(model_types);
1135 } 1135 }
1136 1136
1137 void SyncTest::SetPreexistingPreferencesFileContents( 1137 void SyncTest::SetPreexistingPreferencesFileContents(
1138 const std::string& contents) { 1138 const std::string& contents) {
1139 preexisting_preferences_file_contents_ = contents; 1139 preexisting_preferences_file_contents_ = contents;
1140 } 1140 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698