chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc - Issue 148723002: [sync] Eliminate Await*SyncCompletion methods in integration tests

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 148723002: [sync] Eliminate Await*SyncCompletion methods in integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address feedback Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc ('k') | chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/search_engines/template_url_service.h"	5 #include "chrome/browser/search_engines/template_url_service.h"

6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

7 #include "chrome/browser/sync/test/integration/search_engines_helper.h"	7 #include "chrome/browser/sync/test/integration/search_engines_helper.h"

8 #include "chrome/browser/sync/test/integration/sync_test.h"	8 #include "chrome/browser/sync/test/integration/sync_test.h"

9	9

10 class SingleClientSearchEnginesSyncTest : public SyncTest {	10 class SingleClientSearchEnginesSyncTest : public SyncTest {

11 public:	11 public:

12 SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {}	12 SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {}

13 virtual ~SingleClientSearchEnginesSyncTest() {}	13 virtual ~SingleClientSearchEnginesSyncTest() {}

14	14

15 private:	15 private:

16 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest);	16 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest);

17 };	17 };

18	18

19 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) {	19 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) {

20 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";	20 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

21 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));	21 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));

22	22

23 search_engines_helper::AddSearchEngine(0, 0);	23 search_engines_helper::AddSearchEngine(0, 0);

24	24

25 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());	25 ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());

26 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));	26 ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));

27 }	27 }

OLD	NEW