Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash.

chrome/chrome_tests.gypi

 # Copyright 2013 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.
 {
   'variables': {
     'build_angle_deqp_tests%': 0,
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
@@ skipping 614 matching lines @@
       'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm',
       'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm',
       'browser/ui/cocoa/passwords/passwords_bubble_browsertest.mm',
       'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm',
       'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_browsertest.mm',
       'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm',
       'browser/ui/cocoa/view_id_util_browsertest.mm',
       'browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm',
       'browser/ui/cocoa/website_settings/permission_bubble_cocoa_browser_test.mm',
     ],
-    'chrome_browser_app_list_ash_test_support_sources': [
-      'browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc',
-      'browser/ui/ash/app_list/test/app_list_service_ash_test_api.h',
-    ],
     'chrome_browser_tests_ash_sources': [
       'browser/ui/ash/accelerator_commands_browsertest.cc',
       'browser/ui/ash/accelerator_controller_browsertest.cc',
       'browser/ui/ash/keyboard_controller_browsertest.cc',
       'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
       'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_test.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_test.h',
       'browser/ui/ash/shelf_browsertest.cc',
       'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc',
@@ skipping 1729 matching lines @@
         ['debug_devtools==1', {
           'defines': [
             'DEBUG_DEVTOOLS=1',
           ],
         }],
         ['use_ash==1', {
           'sources': [ '<@(chrome_browser_tests_ash_sources)' ],
           'dependencies': [
             '../ash/ash.gyp:ash_test_support',
           ],
-          'conditions': [
-            ['enable_app_list==1', {
-              'sources': [
-                '<@(chrome_browser_app_list_ash_test_support_sources)'
-              ],
-              'dependencies': [
-                '../ui/app_list/shower/app_list_shower.gyp:app_list_shower_test_support',
-              ],
-            }],
-          ],
         }],
         ['use_aura==1 or toolkit_views==1', {
           'dependencies': [
             '../ui/events/events.gyp:events_test_support',
           ],
         }],
         ['chromeos == 1', {
           'sources': [ '<@(chrome_browser_tests_chromeos_sources)' ],
           'sources!': [
             '../apps/load_and_launch_browsertest.cc',
@@ skipping 1187 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }