Index: remoting/webapp/all_js_load.gtestjs |
diff --git a/remoting/webapp/all_js_load.gtestjs b/remoting/webapp/all_js_load.gtestjs |
index 4e09e5e9a76ebbda9461af794244c111012c0445..d26b74f1f7e154bce98d7bb6f0bbea3347fa3a2e 100644 |
--- a/remoting/webapp/all_js_load.gtestjs |
+++ b/remoting/webapp/all_js_load.gtestjs |
@@ -15,9 +15,9 @@ AllJsLoadTest.prototype = { |
/** @inheritDoc */ |
extraLibraries: [ |
- // All of our Javascript files should be listed here unless they: |
- // (1) have their own .gtestjs file, or |
- // (2) are only used for testing. |
+ 'browser_globals.gtestjs', |
+ // All of our Javascript files should be listed here unless they are |
+ // only used by JSCompiler |
'client_plugin_async.js', |
'client_plugin.js', |
'client_screen.js', |
@@ -26,10 +26,11 @@ AllJsLoadTest.prototype = { |
'clipboard.js', |
'connection_history.js', |
'connection_stats.js', |
- //'cs_oauth2_trampoline.js', // Disabled because it calls |
- // |chrome.i18n.getMessage| when loaded. |
- //'event_handlers.js', // Disabled because it calls |
- // |window.addEventListener| when loaded. |
+ //'cs_oauth2_trampoline.js', // Uses globals in the chrome namespace, which |
+ // give a compilation error when declared in |
+ // browser_globals for some reason. Since this |
+ // file's days are numbered, skip it for now. |
+ 'event_handlers.js', |
//'format_iq.js', // Already covered by format_iq.gtestjs |
'host_controller.js', |
'host_list.js', |
@@ -42,12 +43,10 @@ AllJsLoadTest.prototype = { |
'l10n.js', |
'log_to_server.js', |
'menu_button.js', |
- //'oauth2_callback.js', // Disabled because it calls |
- // |window.addEventListener| when loaded. |
+ 'oauth2_callback.js', |
'oauth2.js', |
'plugin_settings.js', |
- //'xhr_proxy.js', // Disabled because it accesses |XMLHttpRequest| |
- // when loaded, which is not available to tests. |
+ 'xhr_proxy.js', |
'remoting.js', |
'server_log_entry.js', |
'stats_accumulator.js', |
@@ -59,8 +58,7 @@ AllJsLoadTest.prototype = { |
//'wcs_iq_client_proto.js', // Only used by jscompiler. |
'wcs.js', |
'wcs_loader.js', |
- //'wcs_sandbox_content.js', // Disabled because it calls |
- // |window.addEventListener| when loaded. |
+ 'wcs_sandbox_content.js', |
'wcs_sandbox_container.js', |
'xhr.js', |
], |