Updated handling of GCD devices.

remoting/remoting_webapp_files.gypi

 # 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.
 
 # `7MM"""Mq.                       `7MM
 #   MM   `MM.                        MM
 #   MM   ,M9  .gP"Ya   ,6"Yb.   ,M""bMM  `7MMpMMMb.pMMMb.  .gP"Ya
 #   MMmmdM9  ,M'   Yb 8)   MM ,AP    MM    MM    MM    MM ,M'   Yb
 #   MM  YM.  8M""""""  ,pm9MM 8MI    MM    MM    MM    MM 8M""""""
 #   MM   `Mb.YM.    , 8M   MM `Mb    MM    MM    MM    MM YM.    ,
@@ skipping 84 matching lines @@
       'webapp/base/js/window_shape_unittest.js',
       'webapp/base/js/xhr_unittest.js',
       'webapp/base/js/xmpp_connection_unittest.js',
       'webapp/base/js/xmpp_login_handler_unittest.js',
       'webapp/base/js/xmpp_stream_parser_unittest.js',
       'webapp/crd/js/apps_v2_migration_unittest.js',
       'webapp/crd/js/gcd_client_unittest.js',
       'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js',
       'webapp/crd/js/host_controller_unittest.js',
       'webapp/crd/js/host_daemon_facade_unittest.js',
-      'webapp/crd/js/host_list_api_impl_unittest.js',
       'webapp/crd/js/host_table_entry_unittest.js',
+      'webapp/crd/js/legacy_host_list_api_unittest.js',
       'webapp/crd/js/menu_button_unittest.js',
       'webapp/crd/js/mock_xhr_unittest.js',
     ],
     'remoting_webapp_unittests_js_mock_files': [
       'webapp/crd/js/mock_client_plugin.js',
       'webapp/crd/js/mock_host_daemon_facade.js',
       'webapp/crd/js/mock_host_list_api.js',
       'webapp/crd/js/mock_identity.js',
       'webapp/crd/js/mock_signal_strategy.js',
       'webapp/js_proto/chrome_mocks.js',
@@ skipping 140 matching lines @@
       'webapp/crd/js/host_setup_dialog.js',
       'webapp/crd/js/host_install_dialog.js',
       'webapp/crd/js/host_installer.js',
       'webapp/crd/js/it2me_host_facade.js',
       'webapp/crd/js/paired_client_manager.js',
     ],
     # Files for displaying (in the client) info about available hosts.
     'remoting_webapp_js_host_display_files': [
       'webapp/crd/js/host_list.js',
       'webapp/crd/js/host_list_api.js',
-      'webapp/crd/js/host_list_api_gcd_impl.js',
-      'webapp/crd/js/host_list_api_impl.js',
       'webapp/crd/js/host_table_entry.js',
       'webapp/crd/js/local_host_section.js',
+
+      # Must come after host_list_api.js
+      'webapp/crd/js/gcd_host_list_api.js',
+      'webapp/crd/js/legacy_host_list_api.js',
     ],
     # The CRD-specific JavaScript files required by main.html.
     'remoting_webapp_crd_js_ui_files': [
       'webapp/crd/js/bump_scroller.js',
       'webapp/crd/js/butter_bar.js',
       'webapp/crd/js/crd_auth_dialog.js',
       'webapp/crd/js/crd_event_handlers.js',
       'webapp/crd/js/crd_experimental.js',
       'webapp/crd/js/desktop_connected_view.js',
       'webapp/crd/js/desktop_remoting.js',
@@ skipping 230 matching lines @@
       '<(remoting_webapp_template_background)',
       '<(remoting_webapp_template_main)',
       '<(remoting_webapp_template_message_window)',
       '<(remoting_webapp_template_wcs_sandbox)',
       '<@(remoting_webapp_template_files)',
       '<@(remoting_webapp_crd_js_files)',
     ],
 
   },
 }