Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Side by Side Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 159883002: Move TranslatePrefs to the Translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@acceptLanguages
Patch Set: Fix ChromeOS browsertests Created 6 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/values.h" 5 #include "base/values.h"
6 #include "chrome/browser/sync/test/integration/preferences_helper.h" 6 #include "chrome/browser/sync/test/integration/preferences_helper.h"
7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/browser/translate/translate_prefs.h" 9 #include "chrome/browser/translate/translate_tab_helper.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "components/translate/core/browser/translate_prefs.h"
11 #include "components/translate/core/common/translate_pref_names.h" 12 #include "components/translate/core/common/translate_pref_names.h"
12 13
13 using preferences_helper::AppendStringPref; 14 using preferences_helper::AppendStringPref;
14 using preferences_helper::BooleanPrefMatches; 15 using preferences_helper::BooleanPrefMatches;
15 using preferences_helper::ChangeBooleanPref; 16 using preferences_helper::ChangeBooleanPref;
16 using preferences_helper::ChangeIntegerPref; 17 using preferences_helper::ChangeIntegerPref;
17 using preferences_helper::ChangeInt64Pref; 18 using preferences_helper::ChangeInt64Pref;
18 using preferences_helper::ChangeListPref; 19 using preferences_helper::ChangeListPref;
19 using preferences_helper::ChangeStringPref; 20 using preferences_helper::ChangeStringPref;
20 using preferences_helper::GetPrefs; 21 using preferences_helper::GetPrefs;
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 384 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
384 ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload)); 385 ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload));
385 } 386 }
386 387
387 // TCM ID - 3729263. 388 // TCM ID - 3729263.
388 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, 389 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
389 kPrefTranslateLanguageBlacklist) { 390 kPrefTranslateLanguageBlacklist) {
390 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 391 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
391 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate)); 392 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
392 393
393 TranslatePrefs translate_client0_prefs(GetPrefs(0)); 394 scoped_ptr<TranslatePrefs> translate_client0_prefs(
394 TranslatePrefs translate_client1_prefs(GetPrefs(1)); 395 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
395 ASSERT_FALSE(translate_client0_prefs.IsBlockedLanguage("fr")); 396 scoped_ptr<TranslatePrefs> translate_client1_prefs(
396 translate_client0_prefs.BlockLanguage("fr"); 397 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
397 ASSERT_TRUE(translate_client0_prefs.IsBlockedLanguage("fr")); 398 ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
399 translate_client0_prefs->BlockLanguage("fr");
400 ASSERT_TRUE(translate_client0_prefs->IsBlockedLanguage("fr"));
398 401
399 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 402 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
400 ASSERT_TRUE(translate_client1_prefs.IsBlockedLanguage("fr")); 403 ASSERT_TRUE(translate_client1_prefs->IsBlockedLanguage("fr"));
401 404
402 translate_client0_prefs.UnblockLanguage("fr"); 405 translate_client0_prefs->UnblockLanguage("fr");
403 ASSERT_FALSE(translate_client0_prefs.IsBlockedLanguage("fr")); 406 ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
404 407
405 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 408 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
406 ASSERT_FALSE(translate_client1_prefs.IsBlockedLanguage("fr")); 409 ASSERT_FALSE(translate_client1_prefs->IsBlockedLanguage("fr"));
407 } 410 }
408 411
409 // TCM ID - 7307195. 412 // TCM ID - 7307195.
410 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, 413 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
411 kPrefTranslateWhitelists) { 414 kPrefTranslateWhitelists) {
412 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 415 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
413 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate)); 416 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
414 417
415 TranslatePrefs translate_client0_prefs(GetPrefs(0)); 418 scoped_ptr<TranslatePrefs> translate_client0_prefs(
416 TranslatePrefs translate_client1_prefs(GetPrefs(1)); 419 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
417 ASSERT_FALSE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg")); 420 scoped_ptr<TranslatePrefs> translate_client1_prefs(
418 translate_client0_prefs.WhitelistLanguagePair("en", "bg"); 421 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
419 ASSERT_TRUE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg")); 422 ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
423 translate_client0_prefs->WhitelistLanguagePair("en", "bg");
424 ASSERT_TRUE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
420 425
421 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 426 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
422 ASSERT_TRUE(translate_client1_prefs.IsLanguagePairWhitelisted("en", "bg")); 427 ASSERT_TRUE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
423 428
424 translate_client0_prefs.RemoveLanguagePairFromWhitelist("en", "bg"); 429 translate_client0_prefs->RemoveLanguagePairFromWhitelist("en", "bg");
425 ASSERT_FALSE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg")); 430 ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
426 431
427 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 432 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
428 ASSERT_FALSE(translate_client1_prefs.IsLanguagePairWhitelisted("en", "bg")); 433 ASSERT_FALSE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
429 } 434 }
430 435
431 // TCM ID - 3625298. 436 // TCM ID - 3625298.
432 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, 437 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
433 kPrefTranslateSiteBlacklist) { 438 kPrefTranslateSiteBlacklist) {
434 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 439 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
435 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate)); 440 ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
436 441
437 GURL url("http://www.google.com"); 442 GURL url("http://www.google.com");
438 std::string host(url.host()); 443 std::string host(url.host());
439 TranslatePrefs translate_client0_prefs(GetPrefs(0)); 444 scoped_ptr<TranslatePrefs> translate_client0_prefs(
440 TranslatePrefs translate_client1_prefs(GetPrefs(1)); 445 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
441 ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host)); 446 scoped_ptr<TranslatePrefs> translate_client1_prefs(
442 translate_client0_prefs.BlacklistSite(host); 447 TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
443 ASSERT_TRUE(translate_client0_prefs.IsSiteBlacklisted(host)); 448 ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
449 translate_client0_prefs->BlacklistSite(host);
450 ASSERT_TRUE(translate_client0_prefs->IsSiteBlacklisted(host));
444 451
445 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 452 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
446 ASSERT_TRUE(translate_client1_prefs.IsSiteBlacklisted(host)); 453 ASSERT_TRUE(translate_client1_prefs->IsSiteBlacklisted(host));
447 454
448 translate_client0_prefs.RemoveSiteFromBlacklist(host); 455 translate_client0_prefs->RemoveSiteFromBlacklist(host);
449 ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host)); 456 ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
450 457
451 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 458 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
452 ASSERT_FALSE(translate_client1_prefs.IsSiteBlacklisted(host)); 459 ASSERT_FALSE(translate_client1_prefs->IsSiteBlacklisted(host));
453 } 460 }
454 461
455 // TCM ID - 6515252. 462 // TCM ID - 6515252.
456 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, 463 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
457 kExtensionsUIDeveloperMode) { 464 kExtensionsUIDeveloperMode) {
458 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 465 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
459 ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode)); 466 ASSERT_TRUE(BooleanPrefMatches(prefs::kExtensionsUIDeveloperMode));
460 467
461 ChangeBooleanPref(0, prefs::kExtensionsUIDeveloperMode); 468 ChangeBooleanPref(0, prefs::kExtensionsUIDeveloperMode);
462 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 469 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 595 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
589 ASSERT_TRUE(IsEncryptionComplete(0)); 596 ASSERT_TRUE(IsEncryptionComplete(0));
590 ASSERT_TRUE(IsEncryptionComplete(1)); 597 ASSERT_TRUE(IsEncryptionComplete(1));
591 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); 598 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
592 599
593 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); 600 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
594 ChangeBooleanPref(0, prefs::kShowHomeButton); 601 ChangeBooleanPref(0, prefs::kShowHomeButton);
595 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 602 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
596 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); 603 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
597 } 604 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698