chrome/test/live_sync/two_client_live_preferences_sync_test.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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/test/live_sync/two_client_live_preferences_sync_test.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

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

« chrome/chrome_browser.gypi ('K') | « chrome/test/live_sync/profile_sync_service_test_harness.cc ('k') | chrome/test/reliability/page_load_test.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/scoped_pref_update.h"	5 #include "chrome/browser/prefs/scoped_pref_update.h"

6 #include "chrome/test/live_sync/live_preferences_sync_test.h"	6 #include "chrome/test/live_sync/live_preferences_sync_test.h"

7	7

8 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,	8 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest,

9 kHomePageIsNewTabPage) {	9 kHomePageIsNewTabPage) {

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

11 EXPECT_EQ(GetPrefs(0)->GetBoolean(prefs::kHomePageIsNewTabPage),	11 EXPECT_EQ(GetPrefs(0)->GetBoolean(prefs::kHomePageIsNewTabPage),

12 GetPrefs(1)->GetBoolean(prefs::kHomePageIsNewTabPage));	12 GetPrefs(1)->GetBoolean(prefs::kHomePageIsNewTabPage));

13	13

14 bool new_kHomePageIsNewTabPage = !GetVerifierPrefs()->GetBoolean(	14 bool new_kHomePageIsNewTabPage = !GetVerifierPrefs()->GetBoolean(

15 prefs::kHomePageIsNewTabPage);	15 prefs::kHomePageIsNewTabPage);

(...skipping 552 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
568 new_kSafeBrowsingEnabled);	568 new_kSafeBrowsingEnabled);

569 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled,	569 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled,

570 new_kSafeBrowsingEnabled);	570 new_kSafeBrowsingEnabled);

571 EXPECT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	571 EXPECT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

572	572

573 EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),	573 EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),

574 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled));	574 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled));

575 EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),	575 EXPECT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),

576 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled));	576 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled));

577 }	577 }

OLD	NEW