Fix QUnitBrowserTestRunner.Remoting_Webapp_Js_Unittest for GN browser tests.

remoting/webapp/build-html.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Builds the complete main.html file from the basic components.
 """
 
 from HTMLParser import HTMLParser
 import argparse
@@ skipping 125 matching lines @@
   parser.add_argument('output_file')
   parser.add_argument('input_template')
   return parser.parse_args(sys.argv[1:])
 
 
 def main():
   args = parseArgs()
 
   out_file = args.output_file
   js_files = set(args.js) - set(args.exclude_js)
+  instrumented_js_files = set(args.instrument_js) - set(args.exclude_js)

[jam, 2015/08/07 15:54:00]

the comment on line 126 above says this should be done, but it wasn't before.

that was because in gyp, the second duplicate command line argument was being
stripped per the comment
(https://code.google.com/p/chromium/codesearch#chromium/src/remoting/remoting_...).

 
   # Create the output directory if it does not exist.
   out_directory = os.path.dirname(out_file)
   if out_directory is not '' and not os.path.exists(out_directory):
     os.makedirs(out_directory)
 
   # Generate the main HTML file from the templates.
   with open(out_file, 'w') as output:
-    gen = GenerateWebappHtml(args.templates, js_files, args.instrument_js,
+    gen = GenerateWebappHtml(args.templates, js_files, instrumented_js_files,
                              args.template_dir)
     gen.processTemplate(output, args.input_template, 0)
 
     # Verify that all the expected templates were found.
     if not gen.verifyTemplateList():
       error('Extra templates specified')
 
   # Verify that the generated HTML file is valid.
   with open(out_file, 'r') as input_html:
     parser = HtmlChecker()
     parser.feed(input_html.read())
 
 
 if __name__ == '__main__':
   sys.exit(main())