Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 432 matching lines @@
         'browser/chromeos/input_method/xkeyboard.cc',
         'browser/chromeos/input_method/xkeyboard.h',
         'browser/chromeos/language_preferences.cc',
         'browser/chromeos/language_preferences.h',
         'browser/chromeos/locale_change_guard.cc',
         'browser/chromeos/locale_change_guard.h',
         'browser/chromeos/login/account_creation_view.cc',
         'browser/chromeos/login/account_creation_view.h',
         'browser/chromeos/login/account_screen.cc',
         'browser/chromeos/login/account_screen.h',
-        'browser/chromeos/login/apply_services_customization.cc',
-        'browser/chromeos/login/apply_services_customization.h',
         'browser/chromeos/login/auth_attempt_state.cc',
         'browser/chromeos/login/auth_attempt_state.h',
         'browser/chromeos/login/auth_attempt_state_resolver.cc',
         'browser/chromeos/login/auth_attempt_state_resolver.h',
         'browser/chromeos/login/auth_response_handler.cc',
         'browser/chromeos/login/auth_response_handler.h',
         'browser/chromeos/login/authentication_notification_details.h',
         'browser/chromeos/login/authenticator.cc',
         'browser/chromeos/login/authenticator.h',
         'browser/chromeos/login/background_view.cc',
@@ skipping 140 matching lines @@
         'browser/chromeos/login/wizard_accessibility_handler.h',
         'browser/chromeos/login/wizard_accessibility_helper.cc',
         'browser/chromeos/login/wizard_accessibility_helper.h',
         'browser/chromeos/login/wizard_controller.cc',
         'browser/chromeos/login/wizard_controller.h',
         'browser/chromeos/login/wizard_screen.h',
         'browser/chromeos/low_battery_observer.cc',
         'browser/chromeos/low_battery_observer.h',
         'browser/chromeos/metrics_cros_settings_provider.cc',
         'browser/chromeos/metrics_cros_settings_provider.h',
+        'browser/chromeos/name_value_pairs_parser.cc',
+        'browser/chromeos/name_value_pairs_parser.h',
         'browser/chromeos/native_dialog_window.cc',
         'browser/chromeos/native_dialog_window.h',
         'browser/chromeos/network_login_observer.cc',
         'browser/chromeos/network_login_observer.h',
         'browser/chromeos/network_message_observer.cc',
         'browser/chromeos/network_message_observer.h',
         'browser/chromeos/network_state_notifier.cc',
         'browser/chromeos/network_state_notifier.h',
         'browser/chromeos/notifications/balloon_collection_impl.cc',
         'browser/chromeos/notifications/balloon_collection_impl.h',
@@ skipping 3832 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: