Updated *.pak file format to support both UTF8 and UTF16

ui/base/resource/data_pack_unittest.cc

Index: ui/base/resource/data_pack_unittest.cc
diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc
index 0f4809784a0afa22d3433ee040c575ab487c20c1..c47c0301b55c6d7a3b2753f42f3443ea94d91d70 100644
--- a/ui/base/resource/data_pack_unittest.cc
+++ b/ui/base/resource/data_pack_unittest.cc
@@ -54,11 +54,12 @@ TEST(DataPackTest, Write) {
   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));
+  ASSERT_TRUE(DataPack::WritePack(file, resources, DataPack::UTF16));

[tony, 2011/08/29 21:24:39]

Can you have the test write/read the data as UTF16, UTF8 and binary?

[marcvs, 2011/08/30 07:58:55]

I created parameterized tests with TEST_P and INSTANTIATE_TEST_CASE_P for all
three encodings.

 
   // Now try to read the data back in.
   DataPack pack;
   ASSERT_TRUE(pack.Load(file));
+  EXPECT_EQ(pack.GetTextEncodingType(), DataPack::UTF16);
 
   base::StringPiece data;
   ASSERT_TRUE(pack.GetStringPiece(1, &data));