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

chrome_frame/simple_resource_loader.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 "chrome_frame/simple_resource_loader.h"
 
 #include <atlbase.h>
 
 #include <algorithm>
 
@@ skipping 223 matching lines @@
   }
 
   DCHECK(IS_INTRESOURCE(message_id));
 
   base::StringPiece data;
   if (!data_pack_->GetStringPiece(message_id, &data)) {
     DLOG(ERROR) << "Unable to find string for resource id:" << 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;
 }
 
 // static
 std::wstring SimpleResourceLoader::GetLanguage() {
   return SimpleResourceLoader::GetInstance()->language_;
 }
 
 // static
 std::wstring SimpleResourceLoader::Get(int message_id) {
   SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
   return loader->GetLocalizedResource(message_id);
 }
 
 HMODULE SimpleResourceLoader::GetResourceModuleHandle() {
   return locale_dll_handle_;
 }