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

webkit/support/platform_support_mac.mm

 // 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 "webkit/support/platform_support.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "ui/base/resource/data_pack.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
 static ui::DataPack* g_resource_data_pack = NULL;
 
 namespace webkit_support {
@@ skipping 128 matching lines @@
 
 }  // namespace webkit_support
 
 namespace webkit_glue {
 
 string16 GetLocalizedString(int message_id) {
   base::StringPiece res;
   if (!g_resource_data_pack->GetStringPiece(message_id, &res)) {
     LOG(FATAL) << "failed to load webkit string with id " << message_id;
   }
-  return string16(reinterpret_cast<const char16*>(res.data()),
-                  res.length() / 2);
+
+  // Data packs hold strings as either UTF8 or UTF16.
+  string16 msg;
+  switch (g_resource_data_pack->GetTextEncodingType()) {
+  case ui::DataPack::UTF8:
+    msg = UTF8ToUTF16(res);
+    break;
+  case ui::DataPack::UTF16:
+    msg = string16(reinterpret_cast<const char16*>(res.data()),
+                   res.length() / 2);
+    break;
+  case ui::DataPack::BINARY:
+  default:
+    break;
+  }
+
+  return msg;
 }
 
 // Helper method for getting the path to the test shell resources directory.
 static FilePath GetResourcesFilePath() {
   FilePath path;
   // We assume the application is bundled.
   if (!base::mac::AmIBundled()) {
     LOG(FATAL) << "Failed to locate resources. The applicaiton is not bundled.";
   }
   PathService::Get(base::DIR_EXE, &path);
@@ skipping 33 matching lines @@
     return resize_corner_data;
   }
   }
   base::StringPiece res;
   if (g_resource_data_pack)
     g_resource_data_pack->GetStringPiece(resource_id, &res);
   return res;
 }
 
 }  // namespace webkit_glue