chrome/test/live_sync/two_client_live_preferences_sync_test.cc - Issue 6740033: Fixing a failing test case.

Side by Side Diff: chrome/test/live_sync/two_client_live_preferences_sync_test.cc

Issue 6740033: Fixing a failing test case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 8 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 | « no previous file | no next file » | no next file with comments »

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

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

7 #include "chrome/browser/translate/translate_prefs.h"	7 #include "chrome/browser/translate/translate_prefs.h"

8 #include "chrome/common/pref_names.h"	8 #include "chrome/common/pref_names.h"

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

10	10

(...skipping 774 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
785 #if defined(OS_CHROMEOS)	785 #if defined(OS_CHROMEOS)

786 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kEnableScreenLock) {	786 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kEnableScreenLock) {

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

788 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),	788 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),

789 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));	789 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));

790	790

791 bool new_kEnableScreenLock = !GetPrefs(0)->GetBoolean(	791 bool new_kEnableScreenLock = !GetPrefs(0)->GetBoolean(

792 prefs::kEnableScreenLock);	792 prefs::kEnableScreenLock);

793 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock,	793 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock,

794 new_kEnableScreenLock);	794 new_kEnableScreenLock);

795 GetPrefs(0)->SetBoolean(prefs::kTapToClickEnabled, new_kEnableScreenLock);	795 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock, new_kEnableScreenLock);

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

797	797

798 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock),	798 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock),

799 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));	799 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));

800 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),	800 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),

801 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));	801 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));

802	802

803 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock,	803 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock,

804 !new_kEnableScreenLock);	804 !new_kEnableScreenLock);

805 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock,	805 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock,

806 !new_kEnableScreenLock);	806 !new_kEnableScreenLock);

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

808	808

809 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock),	809 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock),

810 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));	810 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));

811 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),	811 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock),

812 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));	812 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock));

813 }	813 }

814 #endif // OS_CHROMEOS	814 #endif // OS_CHROMEOS

OLD	NEW