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

chrome/tools/mac_helpers/infoplist_strings_util.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.
 
 // Helper tool that is built and run during a build to pull strings from
 // the GRD files and generate the InfoPlist.strings files needed for
 // Mac OS X app bundles.
 
 #import <Foundation/Foundation.h>
 
@@ skipping 60 matching lines @@
   return resource_pack;
 }
 
 NSString* LoadStringFromDataPack(ui::DataPack* data_pack,
                                  const char* data_pack_lang,
                                  uint32_t resource_id,
                                  const char* resource_id_str) {
   NSString* result = nil;
   base::StringPiece data;
   if (data_pack->GetStringPiece(resource_id, &data)) {
-    // Data pack encodes strings as UTF16.
-    result =
-        [[[NSString alloc] initWithBytes:data.data()
-                                  length:data.length()
-                                encoding:NSUTF16LittleEndianStringEncoding]
-         autorelease];
+    // Data pack encodes strings as either UTF8 or UTF16.
+    if (data_pack->GetTextEncodingType() == ui::DataPack::UTF8) {
+      result =
+          [[[NSString alloc] initWithBytes:data.data()
+                                    length:data.length()
+                                  encoding:NSUTF8StringEncoding]
+           autorelease];
+    } else if (data_pack->GetTextEncodingType() == ui::DataPack::UTF16) {
+      result =
+          [[[NSString alloc] initWithBytes:data.data()
+                                    length:data.length()
+                                  encoding:NSUTF16LittleEndianStringEncoding]
+           autorelease];
+    } else {
+      fprintf(stderr, "ERROR: requested string %s from binary data pack\n",
+              resource_id_str);
+      exit(1);
+    }
   }
   if (!result) {
     fprintf(stderr, "ERROR: failed to load string %s for lang %s\n",
             resource_id_str, data_pack_lang);
     exit(1);
   }
   return result;
 }
 
 // Escape quotes, newlines, etc so there are no errors when the strings file
@@ skipping 199 matching lines @@
         [output_path stringByAppendingPathComponent:@"InfoPlist.strings"];
     if (![strings_file_contents_utf8 writeToFile:output_path
                                       atomically:YES]) {
       fprintf(stderr, "ERROR: Failed to write out '%s'\n",
               [output_path UTF8String]);
       exit(1);
     }
   }
   return 0;
 }