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

Inserted a new field in the header that specifies which encoding is to be used for the text resources.

I also upped file format to version 4.

BUG=76281
TEST=unit_tests


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100973

Review URL: http://codereview.chromium.org/7744017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101213 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index 2d1e80a..a28a62c 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -241,10 +241,14 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
     return std::wstring();
   }
 
-  // Data pack encodes strings as UTF16.
-  DCHECK_EQ(data.length() % 2, 0U);
-  string16 msg(reinterpret_cast<const char16*>(data.data()),
-               data.length() / 2);
+  // Data pack encodes strings as either UTF8 or UTF16.
+  string16 msg;
+  if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF16) {
+    msg = string16(reinterpret_cast<const char16*>(data.data()),
+                   data.length() / 2);
+  } else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) {
+    msg = UTF8ToUTF16(data);
+  }
   return msg;
 }