summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authoradriansc@chromium.org <adriansc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 01:15:45 +0000
committeradriansc@chromium.org <adriansc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 01:15:45 +0000
commit2c7e28115d1334537dbf984ad6bf2bebf46c8739 (patch)
treecc4adfe3f7bc75400ea75cd5d6c8ce02dc669391 /chrome/browser/prefs
parentdeef80c3e13afea9a86f56103a7721e6a08b2775 (diff)
downloadchromium_src-2c7e28115d1334537dbf984ad6bf2bebf46c8739.zip
chromium_src-2c7e28115d1334537dbf984ad6bf2bebf46c8739.tar.gz
chromium_src-2c7e28115d1334537dbf984ad6bf2bebf46c8739.tar.bz2
Updated *.pak file format to support both UTF8 and UTF16
Inserted a new field in the header that specifies which encoding is to be used for the text resources. I also upped file format to version 4. BUG=76281 TEST=unit_tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100973 Review URL: http://codereview.chromium.org/7744017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/pref_service_unittest.cc25
1 files changed, 0 insertions, 25 deletions
diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc
index f2f6935..c1ebd2b 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -27,31 +27,6 @@
using testing::_;
using testing::Mock;
-// TODO(port): port this test to POSIX.
-#if defined(OS_WIN)
-TEST(PrefServiceTest, LocalizedPrefs) {
- TestingPrefService prefs;
- const char kBoolean[] = "boolean";
- const char kInteger[] = "integer";
- const char kString[] = "string";
- prefs.RegisterLocalizedBooleanPref(kBoolean, IDS_LOCALE_BOOL);
- prefs.RegisterLocalizedIntegerPref(kInteger, IDS_LOCALE_INT);
- prefs.RegisterLocalizedStringPref(kString, IDS_LOCALE_STRING);
-
- // The locale default should take preference over the user default.
- EXPECT_FALSE(prefs.GetBoolean(kBoolean));
- EXPECT_EQ(1, prefs.GetInteger(kInteger));
- EXPECT_EQ("hello", prefs.GetString(kString));
-
- prefs.SetBoolean(kBoolean, true);
- EXPECT_TRUE(prefs.GetBoolean(kBoolean));
- prefs.SetInteger(kInteger, 5);
- EXPECT_EQ(5, prefs.GetInteger(kInteger));
- prefs.SetString(kString, "foo");
- EXPECT_EQ("foo", prefs.GetString(kString));
-}
-#endif
-
TEST(PrefServiceTest, NoObserverFire) {
TestingPrefService prefs;