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

Side by Side 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, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/prefs/chrome_command_line_pref_store.h" 7 #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 10 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 }; 71 };
72 72
73 // Tests to see that webkit preferences are properly loaded and copied over 73 // Tests to see that webkit preferences are properly loaded and copied over
74 // to a WebPreferences object. 74 // to a WebPreferences object.
75 TEST_F(ChromePrefServiceWebKitPrefs, PrefsCopied) { 75 TEST_F(ChromePrefServiceWebKitPrefs, PrefsCopied) {
76 WebPreferences webkit_prefs = 76 WebPreferences webkit_prefs =
77 RenderViewHostTester::For(rvh())->TestComputeWebkitPrefs(); 77 RenderViewHostTester::For(rvh())->TestComputeWebkitPrefs();
78 78
79 // These values have been overridden by the profile preferences. 79 // These values have been overridden by the profile preferences.
80 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding); 80 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding);
81 #if !defined(OS_ANDROID)
81 EXPECT_EQ(20, webkit_prefs.default_font_size); 82 EXPECT_EQ(20, webkit_prefs.default_font_size);
83 #else
84 // This pref is not configurable on Android so the default of 16 is always
85 // used.
86 EXPECT_EQ(16, webkit_prefs.default_font_size);
87 #endif
82 EXPECT_FALSE(webkit_prefs.text_areas_are_resizable); 88 EXPECT_FALSE(webkit_prefs.text_areas_are_resizable);
83 89
84 // These should still be the default values. 90 // These should still be the default values.
85 #if defined(OS_MACOSX) 91 #if defined(OS_MACOSX)
86 const char kDefaultFont[] = "Times"; 92 const char kDefaultFont[] = "Times";
87 #elif defined(OS_CHROMEOS) 93 #elif defined(OS_CHROMEOS)
88 const char kDefaultFont[] = "Tinos"; 94 const char kDefaultFont[] = "Tinos";
89 #else 95 #else
90 const char kDefaultFont[] = "Times New Roman"; 96 const char kDefaultFont[] = "Times New Roman";
91 #endif 97 #endif
92 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont), 98 EXPECT_EQ(base::ASCIIToUTF16(kDefaultFont),
93 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); 99 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
94 EXPECT_TRUE(webkit_prefs.javascript_enabled); 100 EXPECT_TRUE(webkit_prefs.javascript_enabled);
95 } 101 }
OLDNEW
« 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