diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:10:42 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:10:42 +0000 |
commit | 9be7801f04c10701bebea2d721eb6441b18c0ecf (patch) | |
tree | 7b771e719d03e53b4e909ce05202f2b20a9910e4 /chrome/common/pref_service_unittest.cc | |
parent | 28f8649f59869d6c671b2113825846320fe61b00 (diff) | |
download | chromium_src-9be7801f04c10701bebea2d721eb6441b18c0ecf.zip chromium_src-9be7801f04c10701bebea2d721eb6441b18c0ecf.tar.gz chromium_src-9be7801f04c10701bebea2d721eb6441b18c0ecf.tar.bz2 |
Fix the golden file. JSON files should end in CRLF on
all platforms. Also, we sort dictionary keys by value so
the path moved.
BUG=8339
Review URL: http://codereview.chromium.org/39174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_service_unittest.cc')
-rw-r--r-- | chrome/common/pref_service_unittest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/common/pref_service_unittest.cc b/chrome/common/pref_service_unittest.cc index e690579a..ca67119 100644 --- a/chrome/common/pref_service_unittest.cc +++ b/chrome/common/pref_service_unittest.cc @@ -82,7 +82,6 @@ class TestPrefObserver : public NotificationObserver { } // anonymous namespace // This test is disabled. See issue 8339. -#if 0 TEST_F(PrefServiceTest, Basic) { PrefService prefs; @@ -149,7 +148,6 @@ TEST_F(PrefServiceTest, Basic) { ASSERT_TRUE(file_util::PathExists(golden_output_file)); ASSERT_TRUE(file_util::ContentsEqual(golden_output_file, output_file)); } -#endif TEST_F(PrefServiceTest, Overlay) { const std::string transient = |