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

chrome_frame/simple_resource_loader.cc

Index: chrome_frame/simple_resource_loader.cc
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index 2d1e80a49903df618bf62e50810deb7145e1e552..a28a62caa6c1b5678b9ea80f313194e758f81304 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;
 }