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

Unified Diff: chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc

Issue 10540022: mac: Plumbing for the emoji font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: whoops Created 8 years, 2 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
Index: chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
index ac52ef29eb3cfa30b962557323617f8971cba936..9a4ba7f3edc189ec5d386407226bd9a0ad671f6e 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
@@ -92,6 +92,9 @@ IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, PrefsAreMigratedToFontMap) {
prefs->GetString(prefs::kWebKitCursiveFontFamily));
EXPECT_EQ("FantasyFontFamily",
prefs->GetString(prefs::kWebKitFantasyFontFamily));
+ // PictographFontFamily was added after the migration, so it never exists
+ // in the old format (and consequently isn't in the test Preferences file).
+ // So it doesn't need to be tested here.
EXPECT_EQ("FixedFontFamily",
prefs->GetString(prefs::kWebKitFixedFontFamily));
EXPECT_EQ("SansSerifFontFamily",
@@ -155,6 +158,9 @@ IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest2, GlobalPrefsAreMigrated) {
prefs->GetString(prefs::kWebKitCursiveFontFamily));
EXPECT_EQ("FantasyFontFamily",
prefs->GetString(prefs::kWebKitFantasyFontFamily));
+ // PictographFontFamily was added after the migration, so it never exists
+ // in the old format (and consequently isn't in the test Preferences file).
+ // So it doesn't need to be tested here.
EXPECT_EQ("FixedFontFamily",
prefs->GetString(prefs::kWebKitFixedFontFamily));
EXPECT_EQ("SansSerifFontFamily",

Powered by Google App Engine
This is Rietveld 408576698