chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/two_client_search_engines_sync_test.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_typed_urls_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 "base/utf_string_conversions.h"	5 #include "base/strings/utf_string_conversions.h"

6 #include "chrome/browser/search_engines/template_url.h"	6 #include "chrome/browser/search_engines/template_url.h"

7 #include "chrome/browser/search_engines/template_url_service.h"	7 #include "chrome/browser/search_engines/template_url_service.h"

8 #include "chrome/browser/search_engines/template_url_service_factory.h"	8 #include "chrome/browser/search_engines/template_url_service_factory.h"

9 #include "chrome/browser/sync/profile_sync_service_harness.h"	9 #include "chrome/browser/sync/profile_sync_service_harness.h"

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

11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"	11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"

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

13	13

14 class TwoClientSearchEnginesSyncTest : public SyncTest {	14 class TwoClientSearchEnginesSyncTest : public SyncTest {

15 public:	15 public:

(...skipping 214 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	230 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

231 ASSERT_TRUE(search_engines_helper::AllServicesMatch());	231 ASSERT_TRUE(search_engines_helper::AllServicesMatch());

232	232

233 // Change the default on the first client and delete the old default.	233 // Change the default on the first client and delete the old default.

234 search_engines_helper::ChangeDefaultSearchProvider(0, 1);	234 search_engines_helper::ChangeDefaultSearchProvider(0, 1);

235 search_engines_helper::DeleteSearchEngineBySeed(0, 0);	235 search_engines_helper::DeleteSearchEngineBySeed(0, 0);

236 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	236 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

237	237

238 ASSERT_TRUE(search_engines_helper::AllServicesMatch());	238 ASSERT_TRUE(search_engines_helper::AllServicesMatch());

239 }	239 }

OLD	NEW