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

ui/base/resource/data_pack_unittest.cc

 // Copyright (c) 2011 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 36 matching lines @@
   std::string three("three");
   std::string four("four");
   std::string fifteen("fifteen");
 
   std::map<uint16, base::StringPiece> resources;
   resources.insert(std::make_pair(1, base::StringPiece(one)));
   resources.insert(std::make_pair(2, base::StringPiece(two)));
   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));
   EXPECT_EQ(one, data);
   ASSERT_TRUE(pack.GetStringPiece(2, &data));
   EXPECT_EQ(two, data);
   ASSERT_TRUE(pack.GetStringPiece(3, &data));
   EXPECT_EQ(three, data);
   ASSERT_TRUE(pack.GetStringPiece(4, &data));
   EXPECT_EQ(four, data);
   ASSERT_TRUE(pack.GetStringPiece(15, &data));
   EXPECT_EQ(fifteen, data);
 }
 
 }  // namespace ui