chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc - Issue 8879016: Add more per-tab preferences.

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

Unified Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 8879016: Add more per-tab preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix browser_tests Created 9 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/prefs/per_tab_user_pref_store.cc ('K') | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/tab_contents/render_view_host_delegate_helper.cc » ('j') | chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

index 81438b56cfaba4306d17c5958c68f39074dabdfe..a8503734d1de6533e9c456f8f90dbab34fb8222f 100644

--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

@@ -360,13 +360,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

}

// TCM ID - 3673298.

-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kDefaultCharset) {

+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kGlobalDefaultCharset) {

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

- ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));

+ ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset));

- ChangeStringPref(0, prefs::kDefaultCharset, "Thai");

+ ChangeStringPref(0, prefs::kGlobalDefaultCharset, "Thai");

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

- ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));

+ ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset));

}

// TCM ID - 3653296.