This broke lots of layout tests on OSX.

ui/base/resource/data_pack_unittest.cc

Index: ui/base/resource/data_pack_unittest.cc
===================================================================
--- ui/base/resource/data_pack_unittest.cc	(revision 101223)
+++ ui/base/resource/data_pack_unittest.cc	(working copy)
@@ -12,12 +12,6 @@
 
 namespace ui {
 
-class DataPackTest
-    : public testing::TestWithParam<DataPack::TextEncodingType> {
- public:
-  DataPackTest() {}
-};
-
 extern const char kSamplePakContents[];
 extern const size_t kSamplePakSize;
 
@@ -50,13 +44,6 @@
   ASSERT_FALSE(pack.GetStringPiece(140, &data));
 }
 
-INSTANTIATE_TEST_CASE_P(WriteBINARY, DataPackTest, ::testing::Values(
-    DataPack::BINARY));
-INSTANTIATE_TEST_CASE_P(WriteUTF8, DataPackTest, ::testing::Values(
-    DataPack::UTF8));
-INSTANTIATE_TEST_CASE_P(WriteUTF16, DataPackTest, ::testing::Values(
-    DataPack::UTF16));
-
 TEST(DataPackTest, LoadFileWithTruncatedHeader) {
   FilePath data_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &data_path);
@@ -67,7 +54,7 @@
   ASSERT_FALSE(pack.Load(data_path));
 }
 
-TEST_P(DataPackTest, Write) {
+TEST(DataPackTest, Write) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   FilePath file = dir.path().Append(FILE_PATH_LITERAL("data.pak"));
@@ -84,12 +71,11 @@
   resources.insert(std::make_pair(15, base::StringPiece(fifteen)));
   resources.insert(std::make_pair(3, base::StringPiece(three)));
   resources.insert(std::make_pair(4, base::StringPiece(four)));
-  ASSERT_TRUE(DataPack::WritePack(file, resources, GetParam()));
+  ASSERT_TRUE(DataPack::WritePack(file, resources));
 
   // Now try to read the data back in.
   DataPack pack;
   ASSERT_TRUE(pack.Load(file));
-  EXPECT_EQ(pack.GetTextEncodingType(), GetParam());
 
   base::StringPiece data;
   ASSERT_TRUE(pack.GetStringPiece(1, &data));