| 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 } | 357 } |
| 358 #endif // USE_NSS | 358 #endif // USE_NSS |
| 359 | 359 |
| 360 // TestScribe ID - 425639. | 360 // TestScribe ID - 425639. |
| 361 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) { | 361 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) { |
| 362 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 362 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 363 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAlternateErrorPagesEnabled), | 363 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAlternateErrorPagesEnabled), |
| 364 GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 364 GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
| 365 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled), | 365 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled), |
| 366 GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled)); | 366 GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled)); |
| 367 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kDnsPrefetchingEnabled), | 367 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kNetworkPredictionEnabled), |
| 368 GetPrefs(1)->GetBoolean(prefs::kDnsPrefetchingEnabled)); | 368 GetPrefs(1)->GetBoolean(prefs::kNetworkPredictionEnabled)); |
| 369 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled), | 369 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 370 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 370 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 371 | 371 |
| 372 bool new_kAlternateErrorPagesEnabled = !GetVerifierPrefs()->GetBoolean( | 372 bool new_kAlternateErrorPagesEnabled = !GetVerifierPrefs()->GetBoolean( |
| 373 prefs::kAlternateErrorPagesEnabled); | 373 prefs::kAlternateErrorPagesEnabled); |
| 374 bool new_kSearchSuggestEnabled = !GetVerifierPrefs()->GetBoolean( | 374 bool new_kSearchSuggestEnabled = !GetVerifierPrefs()->GetBoolean( |
| 375 prefs::kSearchSuggestEnabled); | 375 prefs::kSearchSuggestEnabled); |
| 376 bool new_kDnsPrefetchingEnabled = !GetVerifierPrefs()->GetBoolean( | 376 bool new_kNetworkPredictionEnabled = !GetVerifierPrefs()->GetBoolean( |
| 377 prefs::kDnsPrefetchingEnabled); | 377 prefs::kNetworkPredictionEnabled); |
| 378 bool new_kSafeBrowsingEnabled = !GetVerifierPrefs()->GetBoolean( | 378 bool new_kSafeBrowsingEnabled = !GetVerifierPrefs()->GetBoolean( |
| 379 prefs::kSafeBrowsingEnabled); | 379 prefs::kSafeBrowsingEnabled); |
| 380 | 380 |
| 381 GetVerifierPrefs()->SetBoolean(prefs::kAlternateErrorPagesEnabled, | 381 GetVerifierPrefs()->SetBoolean(prefs::kAlternateErrorPagesEnabled, |
| 382 new_kAlternateErrorPagesEnabled); | 382 new_kAlternateErrorPagesEnabled); |
| 383 GetPrefs(0)->SetBoolean(prefs::kAlternateErrorPagesEnabled, | 383 GetPrefs(0)->SetBoolean(prefs::kAlternateErrorPagesEnabled, |
| 384 new_kAlternateErrorPagesEnabled); | 384 new_kAlternateErrorPagesEnabled); |
| 385 GetVerifierPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, | 385 GetVerifierPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, |
| 386 new_kSearchSuggestEnabled); | 386 new_kSearchSuggestEnabled); |
| 387 GetPrefs(0)->SetBoolean(prefs::kSearchSuggestEnabled, | 387 GetPrefs(0)->SetBoolean(prefs::kSearchSuggestEnabled, |
| 388 new_kSearchSuggestEnabled); | 388 new_kSearchSuggestEnabled); |
| 389 GetVerifierPrefs()->SetBoolean(prefs::kDnsPrefetchingEnabled, | 389 GetVerifierPrefs()->SetBoolean(prefs::kNetworkPredictionEnabled, |
| 390 new_kDnsPrefetchingEnabled); | 390 new_kNetworkPredictionEnabled); |
| 391 GetPrefs(0)->SetBoolean(prefs::kDnsPrefetchingEnabled, | 391 GetPrefs(0)->SetBoolean(prefs::kNetworkPredictionEnabled, |
| 392 new_kDnsPrefetchingEnabled); | 392 new_kNetworkPredictionEnabled); |
| 393 GetVerifierPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled, | 393 GetVerifierPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled, |
| 394 new_kSafeBrowsingEnabled); | 394 new_kSafeBrowsingEnabled); |
| 395 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, | 395 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, |
| 396 new_kSafeBrowsingEnabled); | 396 new_kSafeBrowsingEnabled); |
| 397 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 397 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 398 | 398 |
| 399 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled), | 399 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled), |
| 400 GetPrefs(0)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 400 GetPrefs(0)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
| 401 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled), | 401 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled), |
| 402 GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); | 402 GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled)); |
| 403 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSearchSuggestEnabled), | 403 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSearchSuggestEnabled), |
| 404 GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled)); | 404 GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled)); |
| 405 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSearchSuggestEnabled), | 405 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSearchSuggestEnabled), |
| 406 GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled)); | 406 GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled)); |
| 407 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kDnsPrefetchingEnabled), | 407 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kNetworkPredictionEnabled), |
| 408 GetPrefs(0)->GetBoolean(prefs::kDnsPrefetchingEnabled)); | 408 GetPrefs(0)->GetBoolean(prefs::kNetworkPredictionEnabled)); |
| 409 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kDnsPrefetchingEnabled), | 409 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kNetworkPredictionEnabled), |
| 410 GetPrefs(1)->GetBoolean(prefs::kDnsPrefetchingEnabled)); | 410 GetPrefs(1)->GetBoolean(prefs::kNetworkPredictionEnabled)); |
| 411 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 411 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 412 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 412 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 413 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 413 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 414 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 414 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 415 } | 415 } |
| 416 | 416 |
| 417 // TestScribe ID - 426766. | 417 // TestScribe ID - 426766. |
| 418 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, ClearData) { | 418 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, ClearData) { |
| 419 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 419 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 420 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kDeleteBrowsingHistory), | 420 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kDeleteBrowsingHistory), |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock, | 782 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock, |
| 783 !new_kEnableScreenLock); | 783 !new_kEnableScreenLock); |
| 784 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 784 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 785 | 785 |
| 786 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock), | 786 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock), |
| 787 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock)); | 787 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock)); |
| 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 #endif // OS_CHROMEOS | 791 #endif // OS_CHROMEOS |
| OLD | NEW |