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

Unified Diff: chrome/browser/prefs/chrome_pref_service_unittest.cc

Issue 2724203003: Don't look up font size preferences on Android. (Closed)
Patch Set: Fix unit test Created 3 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/chrome_content_browser_client.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/chrome_pref_service_unittest.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index 31067d3efe842d5a9fa3e34375c124be09637209..94d65bebe87ae14b13568e41b369384832ec7f1b 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -78,7 +78,13 @@ TEST_F(ChromePrefServiceWebKitPrefs, PrefsCopied) {
// These values have been overridden by the profile preferences.
EXPECT_EQ("UTF-8", webkit_prefs.default_encoding);
+#if !defined(OS_ANDROID)
EXPECT_EQ(20, webkit_prefs.default_font_size);
+#else
+ // This pref is not configurable on Android so the default of 16 is always
+ // used.
+ EXPECT_EQ(16, webkit_prefs.default_font_size);
+#endif
EXPECT_FALSE(webkit_prefs.text_areas_are_resizable);
// These should still be the default values.
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698