Index: remoting/remoting_webapp_files.gypi |
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi |
index 39566d67db4661d86cb7f8a4cfe7b6b2a2f8372a..56a6970c8deed8b207d3b583f70c858f5fa78821 100644 |
--- a/remoting/remoting_webapp_files.gypi |
+++ b/remoting/remoting_webapp_files.gypi |
@@ -55,7 +55,7 @@ |
# |
# These product files are excluded from our JavaScript unittest |
- 'remoting_webapp_unittests_exclude_js_files': [ |
+ 'remoting_webapp_unittest_exclude_js_files': [ |
# background.js is where the onLoad handler is defined, which |
# makes it the entry point of the background page. |
'webapp/crd/js/background.js', |
@@ -68,6 +68,7 @@ |
'webapp/crd/js/apps_v2_migration_unittest.js', |
'webapp/crd/js/desktop_viewport_unittest.js', |
'webapp/crd/js/dns_blackhole_checker_unittest.js', |
+ 'webapp/crd/js/error_unittest.js', |
'webapp/crd/js/fallback_signal_strategy_unittest.js', |
'webapp/crd/js/host_table_entry_unittest.js', |
'webapp/crd/js/l10n_unittest.js', |
@@ -77,33 +78,33 @@ |
'webapp/crd/js/xmpp_login_handler_unittest.js', |
'webapp/crd/js/xmpp_stream_parser_unittest.js', |
], |
- 'remoting_webapp_unittests_js_mock_files': [ |
+ 'remoting_webapp_unittest_js_mock_files': [ |
# Some proto files can be repurposed as simple mocks for the unittests. |
# Note that some defs in chrome_proto are overwritten by chrome_mocks. |
- 'webapp/crd/js/mock_signal_strategy.js', |
'webapp/js_proto/chrome_proto.js', |
- 'webapp/js_proto/chrome_mocks.js', |
+ 'webapp/unittests/chrome_mocks.js', |
+ 'webapp/unittests/mock_signal_strategy.js', |
'webapp/unittests/sinon_helpers.js', |
], |
# Prototypes for objects that are not mocked. |
- 'remoting_webapp_unittests_js_proto_files': [ |
+ 'remoting_webapp_unittest_js_proto_files': [ |
'webapp/js_proto/chrome_cast_proto.js', |
'webapp/js_proto/dom_proto.js', |
'webapp/js_proto/remoting_proto.js', |
'webapp/js_proto/qunit_proto.js', |
'webapp/js_proto/sinon_proto.js', |
], |
- 'remoting_webapp_unittests_all_js_files': [ |
- '<@(remoting_webapp_unittests_js_files)', |
- '<@(remoting_webapp_unittests_js_mock_files)', |
+ 'remoting_webapp_unittest_all_js_files': [ |
+ '<@(remoting_webapp_unittest_js_files)', |
+ '<@(remoting_webapp_unittest_js_mock_files)', |
], |
# All the files needed to run the unittests. |
- 'remoting_webapp_unittests_all_files': [ |
+ 'remoting_webapp_unittest_all_files': [ |
'webapp/crd/html/menu_button.css', |
- '<@(remoting_webapp_unittests_all_js_files)', |
+ '<@(remoting_webapp_unittest_all_js_files)', |
], |
- 'remoting_webapp_unittests_template_main': |
- 'webapp/crd/html/template_unittests.html', |
+ 'remoting_webapp_unittest_template_main': |
+ 'webapp/crd/html/template_unittest.html', |
# |
# Webapp JavaScript file groups. |
@@ -141,7 +142,6 @@ |
'webapp/crd/js/client_plugin_host_desktop_impl.js', |
'webapp/crd/js/client_session.js', |
'webapp/crd/js/clipboard.js', |
- 'webapp/crd/js/connected_view.js', |
'webapp/crd/js/credentials_provider.js', |
'webapp/crd/js/desktop_connected_view.js', |
'webapp/crd/js/host_desktop.js', |
@@ -269,7 +269,6 @@ |
'webapp/crd/js/crd_main.js', |
'webapp/crd/js/desktop_remoting.js', |
'webapp/crd/js/it2me_connect_flow.js', |
- 'webapp/crd/js/me2me_connect_flow.js', |
], |
# These template files are used to construct main.html. |