chrome/browser/sync/test/integration/two_client_preferences_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_preferences_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_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_search_engines_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 <string>	5 #include <string>

6	6

7 #include "base/guid.h"	7 #include "base/guid.h"

	8 #include "base/macros.h"

8 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

9 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

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

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

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

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

14 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

15	16

16 using preferences_helper::AwaitBooleanPrefMatches;	17 using preferences_helper::AwaitBooleanPrefMatches;

17 using preferences_helper::AwaitIntegerPrefMatches;	18 using preferences_helper::AwaitIntegerPrefMatches;

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135	136

136 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);	137 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);

137 ASSERT_TRUE(EnableEncryption(0));	138 ASSERT_TRUE(EnableEncryption(0));

138 ASSERT_TRUE(EnableEncryption(1));	139 ASSERT_TRUE(EnableEncryption(1));

139 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));	140 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));

140	141

141 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));	142 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));

142 ChangeBooleanPref(0, prefs::kShowHomeButton);	143 ChangeBooleanPref(0, prefs::kShowHomeButton);

143 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));	144 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));

144 }	145 }

OLD	NEW