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

tools/grit/grit/node/include.py

 #!/usr/bin/python2.4
 # 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.
 
 '''Handling of the <include> element.
 '''
 
 import os
 
@@ skipping 56 matching lines @@
       return resource_map.SourceFileInclude()
     else:
       return super(type(self), self).ItemFormatter(t)
 
   def FileForLanguage(self, lang, output_dir):
     '''Returns the file for the specified language.  This allows us to return
     different files for different language variants of the include file.
     '''
     return self.FilenameToOpen()
 
-  def GetDataPackPair(self, lang):
+  def GetDataPackPair(self, lang, encoding):
     '''Returns a (id, string) pair that represents the resource id and raw
     bytes of the data.  This is used to generate the data pack data file.
     '''
     from grit.format import rc_header
     id_map = rc_header.Item.tids_
     id = id_map[self.GetTextualIds()[0]]
     if self.attrs['flattenhtml'] == 'true':
       allow_external_script = self.attrs['allowexternalscript'] == 'true'
       data = self._GetFlattenedData(allow_external_script=allow_external_script)
     else:
       filename = self.FilenameToOpen()
       infile = open(filename, 'rb')
       data = infile.read()
       infile.close()
 
+    # Include does not care about the encoding, because it only returns binary
+    # data.
     return id, data
 
   def Flatten(self, output_dir):
     '''Rewrite file references to be base64 encoded data URLs.  The new file
     will be written to output_dir and the name of the new file is returned.'''
     filename = self.FilenameToOpen()
     flat_filename = os.path.join(output_dir,
         self.attrs['name'] + '_' + os.path.basename(filename))
 
     if self._last_flat_filename == flat_filename:
@@ skipping 26 matching lines @@
     node.StartParsing('include', parent)
     node.HandleAttribute('name', name)
     node.HandleAttribute('type', type)
     node.HandleAttribute('file', file)
     node.HandleAttribute('translateable', translateable)
     node.HandleAttribute('filenameonly', filenameonly)
     node.HandleAttribute('relativepath', relativepath)
     node.EndParsing()
     return node
   Construct = staticmethod(Construct)
-