Revert 183647

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 396 matching lines @@
         'browser/chromeos/login/login_performer.h',
         'browser/chromeos/login/login_status_consumer.cc',
         'browser/chromeos/login/login_status_consumer.h',
         'browser/chromeos/login/login_utils.cc',
         'browser/chromeos/login/login_utils.h',
         'browser/chromeos/login/login_web_dialog.cc',
         'browser/chromeos/login/login_web_dialog.h',
         'browser/chromeos/login/login_wizard.h',
         'browser/chromeos/login/message_bubble.cc',
         'browser/chromeos/login/message_bubble.h',
-        'browser/chromeos/login/merge_session_load_page.cc',
-        'browser/chromeos/login/merge_session_load_page.h',
-        'browser/chromeos/login/merge_session_throttle.cc',
-        'browser/chromeos/login/merge_session_throttle.h',
         'browser/chromeos/login/network_screen.cc',
         'browser/chromeos/login/network_screen.h',
         'browser/chromeos/login/network_screen_actor.h',
         'browser/chromeos/login/oauth1_login_manager.cc',
         'browser/chromeos/login/oauth1_login_manager.h',
         'browser/chromeos/login/oauth2_login_manager.cc',
         'browser/chromeos/login/oauth2_login_manager.h',
         'browser/chromeos/login/oauth_login_manager.cc',
         'browser/chromeos/login/oauth_login_manager.h',
         'browser/chromeos/login/oauth1_login_verifier.cc',
@@ skipping 361 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/chromeos/drive/drive.proto' ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/drive',
         'proto_out_dir': 'chrome/browser/chromeos/drive',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }