| 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/prefs/scoped_pref_update.h" | 5 #include "chrome/browser/prefs/scoped_pref_update.h" |
| 6 #include "chrome/common/pref_names.h" |
| 6 #include "chrome/test/live_sync/live_preferences_sync_test.h" | 7 #include "chrome/test/live_sync/live_preferences_sync_test.h" |
| 7 | 8 |
| 8 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, | 9 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, |
| 9 kHomePageIsNewTabPage) { | 10 kHomePageIsNewTabPage) { |
| 10 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 11 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 11 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kHomePageIsNewTabPage), | 12 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kHomePageIsNewTabPage), |
| 12 GetPrefs(1)->GetBoolean(prefs::kHomePageIsNewTabPage)); | 13 GetPrefs(1)->GetBoolean(prefs::kHomePageIsNewTabPage)); |
| 13 | 14 |
| 14 bool new_kHomePageIsNewTabPage = !GetVerifierPrefs()->GetBoolean( | 15 bool new_kHomePageIsNewTabPage = !GetVerifierPrefs()->GetBoolean( |
| 15 prefs::kHomePageIsNewTabPage); | 16 prefs::kHomePageIsNewTabPage); |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 new_kSafeBrowsingEnabled); | 556 new_kSafeBrowsingEnabled); |
| 556 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, | 557 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, |
| 557 new_kSafeBrowsingEnabled); | 558 new_kSafeBrowsingEnabled); |
| 558 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 559 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 559 | 560 |
| 560 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 561 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 561 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 562 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 562 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 563 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 563 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 564 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 564 } | 565 } |
| OLD | NEW |