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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "chrome/browser/sync/test/integration/search_engines_helper.h" | 6 #include "chrome/browser/sync/test/integration/search_engines_helper.h" |
7 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | |
8 #include "chrome/browser/sync/test/integration/sync_test.h" | 7 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 8 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" |
9 #include "components/browser_sync/profile_sync_service.h" | 9 #include "components/browser_sync/profile_sync_service.h" |
10 #include "components/search_engines/template_url_service.h" | 10 #include "components/search_engines/template_url_service.h" |
11 | 11 |
12 using sync_integration_test_util::AwaitCommitActivityCompletion; | |
13 | |
14 class SingleClientSearchEnginesSyncTest : public SyncTest { | 12 class SingleClientSearchEnginesSyncTest : public SyncTest { |
15 public: | 13 public: |
16 SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {} | 14 SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {} |
17 ~SingleClientSearchEnginesSyncTest() override {} | 15 ~SingleClientSearchEnginesSyncTest() override {} |
18 | 16 |
19 private: | 17 private: |
20 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest); | 18 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest); |
21 }; | 19 }; |
22 | 20 |
23 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) { | 21 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) { |
24 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 22 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
25 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0)); | 23 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0)); |
26 | |
27 search_engines_helper::AddSearchEngine(0, 0); | 24 search_engines_helper::AddSearchEngine(0, 0); |
28 | 25 ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
29 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); | |
30 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0)); | 26 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0)); |
31 } | 27 } |
OLD | NEW |