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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/migration_test.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | components/translate.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 036c2818a139a34eb4066fe4df22b7857cfb30b0..e853aafece654d1685be3b606f6bf794b36c302f 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -6,8 +6,9 @@
#include "chrome/browser/sync/test/integration/preferences_helper.h"
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/translate/translate_prefs.h"
+#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/common/pref_names.h"
+#include "components/translate/core/browser/translate_prefs.h"
#include "components/translate/core/common/translate_pref_names.h"
using preferences_helper::AppendStringPref;
@@ -390,20 +391,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
- TranslatePrefs translate_client0_prefs(GetPrefs(0));
- TranslatePrefs translate_client1_prefs(GetPrefs(1));
- ASSERT_FALSE(translate_client0_prefs.IsBlockedLanguage("fr"));
- translate_client0_prefs.BlockLanguage("fr");
- ASSERT_TRUE(translate_client0_prefs.IsBlockedLanguage("fr"));
+ scoped_ptr<TranslatePrefs> translate_client0_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+ scoped_ptr<TranslatePrefs> translate_client1_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+ ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
+ translate_client0_prefs->BlockLanguage("fr");
+ ASSERT_TRUE(translate_client0_prefs->IsBlockedLanguage("fr"));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(translate_client1_prefs.IsBlockedLanguage("fr"));
+ ASSERT_TRUE(translate_client1_prefs->IsBlockedLanguage("fr"));
- translate_client0_prefs.UnblockLanguage("fr");
- ASSERT_FALSE(translate_client0_prefs.IsBlockedLanguage("fr"));
+ translate_client0_prefs->UnblockLanguage("fr");
+ ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_FALSE(translate_client1_prefs.IsBlockedLanguage("fr"));
+ ASSERT_FALSE(translate_client1_prefs->IsBlockedLanguage("fr"));
}
// TCM ID - 7307195.
@@ -412,20 +415,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
- TranslatePrefs translate_client0_prefs(GetPrefs(0));
- TranslatePrefs translate_client1_prefs(GetPrefs(1));
- ASSERT_FALSE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg"));
- translate_client0_prefs.WhitelistLanguagePair("en", "bg");
- ASSERT_TRUE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg"));
+ scoped_ptr<TranslatePrefs> translate_client0_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+ scoped_ptr<TranslatePrefs> translate_client1_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+ ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
+ translate_client0_prefs->WhitelistLanguagePair("en", "bg");
+ ASSERT_TRUE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(translate_client1_prefs.IsLanguagePairWhitelisted("en", "bg"));
+ ASSERT_TRUE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
- translate_client0_prefs.RemoveLanguagePairFromWhitelist("en", "bg");
- ASSERT_FALSE(translate_client0_prefs.IsLanguagePairWhitelisted("en", "bg"));
+ translate_client0_prefs->RemoveLanguagePairFromWhitelist("en", "bg");
+ ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_FALSE(translate_client1_prefs.IsLanguagePairWhitelisted("en", "bg"));
+ ASSERT_FALSE(translate_client1_prefs->IsLanguagePairWhitelisted("en", "bg"));
}
// TCM ID - 3625298.
@@ -436,20 +441,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
GURL url("http://www.google.com");
std::string host(url.host());
- TranslatePrefs translate_client0_prefs(GetPrefs(0));
- TranslatePrefs translate_client1_prefs(GetPrefs(1));
- ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host));
- translate_client0_prefs.BlacklistSite(host);
- ASSERT_TRUE(translate_client0_prefs.IsSiteBlacklisted(host));
+ scoped_ptr<TranslatePrefs> translate_client0_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+ scoped_ptr<TranslatePrefs> translate_client1_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+ ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
+ translate_client0_prefs->BlacklistSite(host);
+ ASSERT_TRUE(translate_client0_prefs->IsSiteBlacklisted(host));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(translate_client1_prefs.IsSiteBlacklisted(host));
+ ASSERT_TRUE(translate_client1_prefs->IsSiteBlacklisted(host));
- translate_client0_prefs.RemoveSiteFromBlacklist(host);
- ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host));
+ translate_client0_prefs->RemoveSiteFromBlacklist(host);
+ ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_FALSE(translate_client1_prefs.IsSiteBlacklisted(host));
+ ASSERT_FALSE(translate_client1_prefs->IsSiteBlacklisted(host));
}
// TCM ID - 6515252.
« no previous file with comments | « chrome/browser/sync/test/integration/migration_test.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | components/translate.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698