| 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/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."; |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 GetPrefs(0)->GetInteger(prefs::kRestoreOnStartup)); | 294 GetPrefs(0)->GetInteger(prefs::kRestoreOnStartup)); |
| 295 ASSERT_EQ(GetVerifierPrefs()->GetInteger(prefs::kRestoreOnStartup), | 295 ASSERT_EQ(GetVerifierPrefs()->GetInteger(prefs::kRestoreOnStartup), |
| 296 GetPrefs(1)->GetInteger(prefs::kRestoreOnStartup)); | 296 GetPrefs(1)->GetInteger(prefs::kRestoreOnStartup)); |
| 297 } | 297 } |
| 298 | 298 |
| 299 #if defined(USE_NSS) | 299 #if defined(USE_NSS) |
| 300 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Security) { | 300 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Security) { |
| 301 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 301 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 302 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled), | 302 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled), |
| 303 GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); | 303 GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); |
| 304 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSSL2Enabled), | |
| 305 GetPrefs(1)->GetBoolean(prefs::kSSL2Enabled)); | |
| 306 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSSL3Enabled), | 304 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSSL3Enabled), |
| 307 GetPrefs(1)->GetBoolean(prefs::kSSL3Enabled)); | 305 GetPrefs(1)->GetBoolean(prefs::kSSL3Enabled)); |
| 308 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kTLS1Enabled), | 306 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kTLS1Enabled), |
| 309 GetPrefs(1)->GetBoolean(prefs::kTLS1Enabled)); | 307 GetPrefs(1)->GetBoolean(prefs::kTLS1Enabled)); |
| 310 | 308 |
| 311 bool new_kCertRevocationCheckingEnabled = !GetVerifierPrefs()->GetBoolean( | 309 bool new_kCertRevocationCheckingEnabled = !GetVerifierPrefs()->GetBoolean( |
| 312 prefs::kCertRevocationCheckingEnabled); | 310 prefs::kCertRevocationCheckingEnabled); |
| 313 bool new_kSSL2Enabled = !GetVerifierPrefs()->GetBoolean( | |
| 314 prefs::kSSL2Enabled); | |
| 315 bool new_kSSL3Enabled = !GetVerifierPrefs()->GetBoolean( | 311 bool new_kSSL3Enabled = !GetVerifierPrefs()->GetBoolean( |
| 316 prefs::kSSL3Enabled); | 312 prefs::kSSL3Enabled); |
| 317 bool new_kTLS1Enabled = !GetVerifierPrefs()->GetBoolean( | 313 bool new_kTLS1Enabled = !GetVerifierPrefs()->GetBoolean( |
| 318 prefs::kTLS1Enabled); | 314 prefs::kTLS1Enabled); |
| 319 | 315 |
| 320 GetVerifierPrefs()->SetBoolean(prefs::kCertRevocationCheckingEnabled, | 316 GetVerifierPrefs()->SetBoolean(prefs::kCertRevocationCheckingEnabled, |
| 321 new_kCertRevocationCheckingEnabled); | 317 new_kCertRevocationCheckingEnabled); |
| 322 GetPrefs(0)->SetBoolean(prefs::kCertRevocationCheckingEnabled, | 318 GetPrefs(0)->SetBoolean(prefs::kCertRevocationCheckingEnabled, |
| 323 new_kCertRevocationCheckingEnabled); | 319 new_kCertRevocationCheckingEnabled); |
| 324 GetVerifierPrefs()->SetBoolean(prefs::kSSL2Enabled, new_kSSL2Enabled); | |
| 325 GetPrefs(0)->SetBoolean(prefs::kSSL2Enabled, new_kSSL2Enabled); | |
| 326 GetVerifierPrefs()->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled); | 320 GetVerifierPrefs()->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled); |
| 327 GetPrefs(0)->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled); | 321 GetPrefs(0)->SetBoolean(prefs::kSSL3Enabled, new_kSSL3Enabled); |
| 328 GetVerifierPrefs()->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled); | 322 GetVerifierPrefs()->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled); |
| 329 GetPrefs(0)->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled); | 323 GetPrefs(0)->SetBoolean(prefs::kTLS1Enabled, new_kTLS1Enabled); |
| 330 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 324 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 331 | 325 |
| 332 ASSERT_EQ(GetVerifierPrefs()-> | 326 ASSERT_EQ(GetVerifierPrefs()-> |
| 333 GetBoolean(prefs::kCertRevocationCheckingEnabled), | 327 GetBoolean(prefs::kCertRevocationCheckingEnabled), |
| 334 GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); | 328 GetPrefs(0)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); |
| 335 ASSERT_NE(GetVerifierPrefs()-> | 329 ASSERT_NE(GetVerifierPrefs()-> |
| 336 GetBoolean(prefs::kCertRevocationCheckingEnabled), | 330 GetBoolean(prefs::kCertRevocationCheckingEnabled), |
| 337 GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); | 331 GetPrefs(1)->GetBoolean(prefs::kCertRevocationCheckingEnabled)); |
| 338 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSSL2Enabled), | |
| 339 GetPrefs(0)->GetBoolean(prefs::kSSL2Enabled)); | |
| 340 ASSERT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL2Enabled), | |
| 341 GetPrefs(1)->GetBoolean(prefs::kSSL2Enabled)); | |
| 342 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled), | 332 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled), |
| 343 GetPrefs(0)->GetBoolean(prefs::kSSL3Enabled)); | 333 GetPrefs(0)->GetBoolean(prefs::kSSL3Enabled)); |
| 344 ASSERT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled), | 334 ASSERT_NE(GetVerifierPrefs()->GetBoolean(prefs::kSSL3Enabled), |
| 345 GetPrefs(1)->GetBoolean(prefs::kSSL3Enabled)); | 335 GetPrefs(1)->GetBoolean(prefs::kSSL3Enabled)); |
| 346 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled), | 336 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled), |
| 347 GetPrefs(0)->GetBoolean(prefs::kTLS1Enabled)); | 337 GetPrefs(0)->GetBoolean(prefs::kTLS1Enabled)); |
| 348 ASSERT_NE(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled), | 338 ASSERT_NE(GetVerifierPrefs()->GetBoolean(prefs::kTLS1Enabled), |
| 349 GetPrefs(1)->GetBoolean(prefs::kTLS1Enabled)); | 339 GetPrefs(1)->GetBoolean(prefs::kTLS1Enabled)); |
| 350 } | 340 } |
| 351 #endif // USE_NSS | 341 #endif // USE_NSS |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 new_kSafeBrowsingEnabled); | 555 new_kSafeBrowsingEnabled); |
| 566 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, | 556 GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled, |
| 567 new_kSafeBrowsingEnabled); | 557 new_kSafeBrowsingEnabled); |
| 568 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 558 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 569 | 559 |
| 570 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 560 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 571 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 561 GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 572 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), | 562 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled), |
| 573 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); | 563 GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled)); |
| 574 } | 564 } |
| OLD | NEW |