Use platform-appropriate newlines in JSON output

chrome/common/pref_service_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/test/data/resource.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
@@ skipping 127 matching lines @@
   EXPECT_EQ(FilePath::StringType(FILE_PATH_LITERAL("/usr/local/")),
       prefs.GetFilePath(kSomeDirectory).value());
   prefs.SetFilePath(kSomeDirectory, some_path);
   EXPECT_EQ(some_path.value(), prefs.GetFilePath(kSomeDirectory).value());
 
   // Serialize and compare to expected output.
   FilePath output_file = test_dir_.AppendASCII("write.json");
   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));
 }
 
 TEST_F(PrefServiceTest, Overlay) {
   const std::string transient =
     "{\"bool\":true, \"int\":2, \"real\":2.0, \"string\":\"transient\","
     "\"dictionary\":{\"value\":\"transient\"},"
     "\"list\":[\"transient\"]}";
 
   std::wstring persistent_string(L"persistent");
@@ skipping 237 matching lines @@
 
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
   prefs.RegisterStringPref(path, std::wstring());
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
   prefs.SetString(path, L"blah");
   EXPECT_TRUE(prefs.HasPrefPath(path));
 }