Revert of ChromeOS login webui refactoring: split user selection/gaia login screens.

chrome/chrome_browser_chromeos.gypi

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_chromeos',
       'type': 'static_library',
@@ skipping 569 matching lines @@
         'browser/chromeos/login/screens/base_screen.h',
         'browser/chromeos/login/screens/core_oobe_actor.h',
         'browser/chromeos/login/screens/error_screen.cc',
         'browser/chromeos/login/screens/error_screen.h',
         'browser/chromeos/login/screens/error_screen_actor.cc',
         'browser/chromeos/login/screens/error_screen_actor.h',
         'browser/chromeos/login/screens/error_screen_actor_delegate.h',
         'browser/chromeos/login/screens/eula_screen.cc',
         'browser/chromeos/login/screens/eula_screen.h',
         'browser/chromeos/login/screens/eula_screen_actor.h',
-        'browser/chromeos/login/screens/gaia_screen.cc',
-        'browser/chromeos/login/screens/gaia_screen.h',
         'browser/chromeos/login/screens/hid_detection_screen.cc',
         'browser/chromeos/login/screens/hid_detection_screen.h',
         'browser/chromeos/login/screens/hid_detection_screen_actor.h',
         'browser/chromeos/login/screens/kiosk_autolaunch_screen.cc',
         'browser/chromeos/login/screens/kiosk_autolaunch_screen.h',
         'browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h',
         'browser/chromeos/login/screens/kiosk_enable_screen.cc',
         'browser/chromeos/login/screens/kiosk_enable_screen.h',
         'browser/chromeos/login/screens/kiosk_enable_screen_actor.h',
         'browser/chromeos/login/screens/network_screen.cc',
@@ skipping 12 matching lines @@
         'browser/chromeos/login/screens/screen_observer.h',
         'browser/chromeos/login/screens/terms_of_service_screen.cc',
         'browser/chromeos/login/screens/terms_of_service_screen.h',
         'browser/chromeos/login/screens/terms_of_service_screen_actor.h',
         'browser/chromeos/login/screens/update_screen.cc',
         'browser/chromeos/login/screens/update_screen.h',
         'browser/chromeos/login/screens/update_screen_actor.h',
         'browser/chromeos/login/screens/user_image_screen.cc',
         'browser/chromeos/login/screens/user_image_screen.h',
         'browser/chromeos/login/screens/user_image_screen_actor.h',
-        'browser/chromeos/login/screens/user_selection_screen.cc',
-        'browser/chromeos/login/screens/user_selection_screen.h',
         'browser/chromeos/login/screens/wizard_screen.cc',
         'browser/chromeos/login/screens/wizard_screen.h',
         'browser/chromeos/login/screens/wrong_hwid_screen.cc',
         'browser/chromeos/login/screens/wrong_hwid_screen.h',
         'browser/chromeos/login/screens/wrong_hwid_screen_actor.h',
         'browser/chromeos/login/signin/auth_sync_observer.cc',
         'browser/chromeos/login/signin/auth_sync_observer.h',
         'browser/chromeos/login/signin/auth_sync_observer_factory.cc',
         'browser/chromeos/login/signin/auth_sync_observer_factory.h',
         'browser/chromeos/login/signin/merge_session_load_page.cc',
@@ skipping 513 matching lines @@
         'browser/chromeos/attestation/attestation_signed_data.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/attestation',
         'proto_out_dir': 'chrome/browser/chromeos/attestation',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }