OLD | NEW |
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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 mock_host_resolver_override_.reset( | 706 mock_host_resolver_override_.reset( |
707 new net::ScopedDefaultHostResolverProc(resolver)); | 707 new net::ScopedDefaultHostResolverProc(resolver)); |
708 } | 708 } |
709 | 709 |
710 void SyncTest::TearDownInProcessBrowserTestFixture() { | 710 void SyncTest::TearDownInProcessBrowserTestFixture() { |
711 mock_host_resolver_override_.reset(); | 711 mock_host_resolver_override_.reset(); |
712 } | 712 } |
713 | 713 |
714 void SyncTest::WaitForDataModels(Profile* profile) { | 714 void SyncTest::WaitForDataModels(Profile* profile) { |
715 bookmarks::test::WaitForBookmarkModelToLoad( | 715 bookmarks::test::WaitForBookmarkModelToLoad( |
716 BookmarkModelFactory::GetForProfile(profile)); | 716 BookmarkModelFactory::GetForBrowserContext(profile)); |
717 ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( | 717 ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( |
718 profile, ServiceAccessType::EXPLICIT_ACCESS)); | 718 profile, ServiceAccessType::EXPLICIT_ACCESS)); |
719 search_test_utils::WaitForTemplateURLServiceToLoad( | 719 search_test_utils::WaitForTemplateURLServiceToLoad( |
720 TemplateURLServiceFactory::GetForProfile(profile)); | 720 TemplateURLServiceFactory::GetForProfile(profile)); |
721 } | 721 } |
722 | 722 |
723 void SyncTest::ReadPasswordFile() { | 723 void SyncTest::ReadPasswordFile() { |
724 base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); | 724 base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); |
725 password_file_ = cl->GetSwitchValuePath(switches::kPasswordFileForTest); | 725 password_file_ = cl->GetSwitchValuePath(switches::kPasswordFileForTest); |
726 if (password_file_.empty()) | 726 if (password_file_.empty()) |
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 } |
OLD | NEW |