diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 21:17:24 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 21:17:24 +0000 |
| commit | b81637c3d9f2cf895b81d5b673b88668b6bc1322 (patch) | |
| tree | 795f338852b7d40508e837ece010d64b4ad14d9f /chrome/common | |
| parent | eb0ef6ce145aab92fdf7f99f4ebe14ef7b03736c (diff) | |
| download | chromium_src-b81637c3d9f2cf895b81d5b673b88668b6bc1322.zip chromium_src-b81637c3d9f2cf895b81d5b673b88668b6bc1322.tar.gz chromium_src-b81637c3d9f2cf895b81d5b673b88668b6bc1322.tar.bz2 | |
Use platform-appropriate newlines in JSON output.
BUG=15462
TEST=base_unittests, unit_tests, check newlines in bookmarks file
Review URL: http://codereview.chromium.org/147220
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/json_value_serializer_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/common/pref_service_unittest.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc index 5c50596..877ac6e 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -293,7 +293,8 @@ TEST_F(JSONFileValueSerializerTest, Roundtrip) { ASSERT_TRUE(file_util::PathExists(written_file_path)); // Now compare file contents. - EXPECT_TRUE(file_util::ContentsEqual(original_file_path, written_file_path)); + EXPECT_TRUE(file_util::TextContentsEqual(original_file_path, + written_file_path)); EXPECT_TRUE(file_util::Delete(written_file_path, false)); } @@ -321,7 +322,8 @@ TEST_F(JSONFileValueSerializerTest, RoundtripNested) { ASSERT_TRUE(file_util::PathExists(written_file_path)); // Now compare file contents. - EXPECT_TRUE(file_util::ContentsEqual(original_file_path, written_file_path)); + EXPECT_TRUE(file_util::TextContentsEqual(original_file_path, + written_file_path)); EXPECT_TRUE(file_util::Delete(written_file_path, false)); } diff --git a/chrome/common/pref_service_unittest.cc b/chrome/common/pref_service_unittest.cc index 1c017a2..29b4b09 100644 --- a/chrome/common/pref_service_unittest.cc +++ b/chrome/common/pref_service_unittest.cc @@ -145,7 +145,7 @@ TEST_F(PrefServiceTest, Basic) { FilePath golden_output_file = data_dir_.AppendASCII("write.golden.json"); ASSERT_TRUE(file_util::PathExists(golden_output_file)); ASSERT_TRUE(prefs.SavePersistentPrefs()); - EXPECT_TRUE(file_util::ContentsEqual(golden_output_file, output_file)); + EXPECT_TRUE(file_util::TextContentsEqual(golden_output_file, output_file)); ASSERT_TRUE(file_util::Delete(output_file, false)); } |