Merge 38 changes to bleeding edge

tools/dartium/archive.py

 #!/usr/bin/python
 
 # 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.
 
 import glob
 import optparse
 import os
 import shutil
 import sys
 import utils
 
 HOST_OS = utils.guessOS()
 
 if HOST_OS == 'mac':
   CONTENTSHELL_FILES = ['Content Shell.app', 'ffmpegsumo.so', 'osmesa.so',
                         'lib']
   CHROMEDRIVER_FILES = ['chromedriver']
 elif HOST_OS == 'linux':
   CONTENTSHELL_FILES = ['content_shell', 'content_shell.pak', 'fonts.conf',
                         'libffmpegsumo.so', 'libosmesa.so', 'lib',
-                        'icudtl.dat']
+                        'icudtl.dat', 'AHEM____.TTF', 'GardinerModBug.ttf',
+                        'GardinerModCat.ttf']
   CHROMEDRIVER_FILES = ['chromedriver']
 elif HOST_OS == 'win':
   # TODO: provide proper list.
   CONTENTSHELL_FILES = ['content_shell.exe', 'AHEM____.ttf']
   CHROMEDRIVER_FILES = ['chromedriver.exe']
 else:
   raise Exception('Unsupported platform')
 
 # Append a file with size of the snapshot.
 CONTENTSHELL_FILES.append('snapshot-size.txt')
@@ skipping 146 matching lines @@
                     action='store', type='string',
                     help='(Release|Debug)')
   (options, args) = parser.parse_args()
   Archive(srcpath, options.mode, options.dartium, options.contentshell,
           options.chromedriver)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())