chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

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 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 12 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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_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 "base/macros.h"

5 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

6 #include "chrome/browser/search_engines/template_url_service_factory.h"	7 #include "chrome/browser/search_engines/template_url_service_factory.h"

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

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

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

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

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

12 #include "components/search_engines/template_url.h"	13 #include "components/search_engines/template_url.h"

13 #include "components/search_engines/template_url_service.h"	14 #include "components/search_engines/template_url_service.h"

14	15

(...skipping 214 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
229 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());	230 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());

230	231

231 search_engines_helper::ChangeDefaultSearchProvider(0, 0);	232 search_engines_helper::ChangeDefaultSearchProvider(0, 0);

232 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());	233 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());

233	234

234 // Change the default on the first client and delete the old default.	235 // Change the default on the first client and delete the old default.

235 search_engines_helper::ChangeDefaultSearchProvider(0, 1);	236 search_engines_helper::ChangeDefaultSearchProvider(0, 1);

236 search_engines_helper::DeleteSearchEngineBySeed(0, 0);	237 search_engines_helper::DeleteSearchEngineBySeed(0, 0);

237 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());	238 ASSERT_TRUE(search_engines_helper::AwaitAllServicesMatch());

238 }	239 }

OLD	NEW