chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc - Issue 378253002: Fix translate namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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/renderer_context_menu/render_view_context_menu.cc ('k') | chrome/browser/translate/chrome_translate_client.h » ('j') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 7f644173f4e8a837f1038c9ae4b1fcf6f0995894..c7f124dcddd050b27275e90170a4b13bc615b14d 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

@@ -416,9 +416,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));

- scoped_ptr<TranslatePrefs> translate_client0_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client0_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));

- scoped_ptr<TranslatePrefs> translate_client1_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client1_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));

ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));

translate_client0_prefs->BlockLanguage("fr");

@@ -440,9 +440,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));

- scoped_ptr<TranslatePrefs> translate_client0_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client0_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));

- scoped_ptr<TranslatePrefs> translate_client1_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client1_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));

ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));

translate_client0_prefs->WhitelistLanguagePair("en", "bg");

@@ -466,9 +466,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

GURL url("http://www.google.com");

std::string host(url.host());

- scoped_ptr<TranslatePrefs> translate_client0_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client0_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));

- scoped_ptr<TranslatePrefs> translate_client1_prefs(

+ scoped_ptr<translate::TranslatePrefs> translate_client1_prefs(

ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));

ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));

translate_client0_prefs->BlacklistSite(host);