Revert of Add GN interactive UI tests

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': {
     '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',
       'browser/extensions/browsertest_util.cc',
@@ skipping 293 matching lines @@
       'browser/extensions/api/management/management_browsertest.cc',
       'browser/extensions/api/mdns/mdns_apitest.cc',
       'browser/extensions/api/media_galleries/media_galleries_apitest.cc',
       'browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc',
       'browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc',
       'browser/extensions/api/messaging/native_messaging_apitest.cc',
       'browser/extensions/api/metrics_private/metrics_apitest.cc',
       'browser/extensions/api/module/module_apitest.cc',
       'browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc',
       'browser/extensions/api/notification_provider/notification_provider_apitest.cc',
+      'browser/extensions/api/notifications/notifications_apitest.cc',
       'browser/extensions/api/omnibox/omnibox_api_browsertest.cc',
       'browser/extensions/api/page_capture/page_capture_apitest.cc',
       'browser/extensions/api/permissions/permissions_apitest.cc',
       'browser/extensions/api/preference/preference_apitest.cc',
       'browser/extensions/api/preferences_private/preferences_private_apitest.cc',
       'browser/extensions/api/processes/processes_apitest.cc',
       'browser/extensions/api/proxy/proxy_apitest.cc',
       'browser/extensions/api/push_messaging/push_messaging_apitest.cc',
       'browser/extensions/api/push_messaging/push_messaging_canary_test.cc',
       'browser/extensions/api/push_messaging/sync_setup_helper.cc',
@@ skipping 148 matching lines @@
       'browser/metrics/metrics_service_browsertest.cc',
       'browser/net/cookie_policy_browsertest.cc',
       'browser/net/dns_probe_browsertest.cc',
       'browser/net/ftp_browsertest.cc',
       'browser/net/load_timing_browsertest.cc',
       'browser/net/nss_context_chromeos_browsertest.cc',
       'browser/net/predictor_browsertest.cc',
       'browser/net/proxy_browsertest.cc',
       'browser/net/sdch_browsertest.cc',
       'browser/net/websocket_browsertest.cc',
+      'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
+      'browser/notifications/message_center_notifications_browsertest.cc',
       'browser/password_manager/password_manager_browsertest.cc',
       'browser/policy/cloud/cloud_policy_browsertest.cc',
       'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
       'browser/policy/cloud/component_cloud_policy_browsertest.cc',
       'browser/policy/cloud/device_management_service_browsertest.cc',
       'browser/policy/cloud/test_request_interceptor.cc',
       'browser/policy/cloud/test_request_interceptor.h',
       'browser/policy/policy_browsertest.cc',
       'browser/policy/policy_prefs_browsertest.cc',
       'browser/prefetch/prefetch_browsertest.cc',
@@ skipping 374 matching lines @@
       'browser/ui/browser_focus_uitest.cc',
       'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc',
       'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm',
       'browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc',
       'browser/ui/find_bar/find_bar_host_interactive_uitest.cc',
       'browser/ui/omnibox/omnibox_view_browsertest.cc',
       'browser/ui/panels/base_panel_browser_test.cc',
       'browser/ui/panels/base_panel_browser_test.h',
+      'browser/ui/panels/detached_panel_browsertest.cc',
+      'browser/ui/panels/docked_panel_browsertest.cc',
       'browser/ui/panels/test_panel_active_state_observer.cc',
       'browser/ui/panels/test_panel_active_state_observer.h',
       'browser/ui/panels/test_panel_mouse_watcher.cc',
       'browser/ui/panels/test_panel_mouse_watcher.h',
       'browser/ui/panels/test_panel_notification_observer.cc',
       'browser/ui/panels/test_panel_notification_observer.h',
       'browser/ui/panels/test_panel_collection_squeeze_observer.cc',
       'browser/ui/panels/test_panel_collection_squeeze_observer.h',
       'browser/ui/passwords/manage_passwords_test.cc',
       'browser/ui/passwords/manage_passwords_test.h',
@@ skipping 79 matching lines @@
       'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc',
       'browser/ui/views/location_bar/star_view_browsertest.cc',
       'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
       'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
       'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
       'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
       'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
     ],
     'chrome_interactive_ui_test_notifications_sources': [
-      'browser/extensions/api/notifications/notifications_apitest.cc',
+      'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
       'browser/notifications/message_center_notifications_browsertest.cc',
     ],
     'chrome_interactive_ui_test_chromeos_sources': [
       'browser/chromeos/accessibility/magnification_controller_browsertest.cc',
       'browser/chromeos/accessibility/speech_monitor.cc',
       'browser/chromeos/accessibility/speech_monitor.h',
       'browser/chromeos/accessibility/spoken_feedback_browsertest.cc',
       'browser/chromeos/accessibility/sticky_keys_browsertest.cc',
       'browser/chromeos/input_method/textinput_browsertest.cc',
       'browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc',
@@ skipping 457 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }, {  # Non-Linux platforms (Linux includes ChromeOS here).
           'sources': [
             '<@(chrome_interactive_ui_test_non_linux_and_chromeos_sources)',
           ],
         }],
         ['OS=="linux" and chromeos==0', {
           'sources!': [
-            # TODO(port): This times out. Attempts have been made to fix the
-            # individual failures, but each time I disable a test from these
-            # suites, it seems like one or another starts timing out too.
-
-            # Note: list duplicated in GN build.
-            'browser/ui/views/keyboard_access_browsertest.cc',
+            # TODO(port): Everything here times out. Attempts have been made to
+            # fix the individual failures, but each time I disable a test from
+            # these suites, it seems like one or another starts timing out too.
+            'browser/ui/views/keyboard_access_browsertest.cc',  # Views except Mac views.
           ],
         }, {  # Everything but desktop Linux.
           'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)' ],
         }],
         ['use_ash==1', {
           'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ],
-          'dependencies': [
-            '../ash/ash.gyp:ash_test_support',
-          ],
+        }],
+        ['OS != "mac"', {
+          'sources': [ '<@(chrome_interactive_ui_test_non_mac_sources)' ],
         }],
         ['OS=="mac"', {
           'sources!': [
             # TODO(tapted): Enable toolkit-views tests on Mac when their
             # respective implementations are ported.
-
-            # Note: Sources list duplicated in GN build.
             'browser/ui/views/keyboard_access_browsertest.cc',
             'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
             'browser/ui/views/panels/panel_view_browsertest.cc',
             'browser/ui/views/toolbar/toolbar_button_test.cc',
           ],
           'dependencies': [
             'chrome'
           ],
           # See comment about the same line in chrome/chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-        }, {  # Non-Mac.
-          'sources': [ '<@(chrome_interactive_ui_test_non_mac_sources)' ],
-        }],
+        }],  # OS=="mac"
         ['notifications == 1', {
           # Common notifications tests.
           'sources': [
-            '<@(chrome_interactive_ui_test_notifications_sources)',
+            'browser/extensions/notifications_apitest.cc',
           ],
           'conditions': [
-            ['chromeos == 1', {
-              'sources': [
-                'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
-              ],
-            }, {
+            ['chromeos == 0', {
               # Non-ChromeOS notifications tests (ChromeOS does not use
               # cross-platform panels).
               'sources': [
-                # Note: List duplicated in GN build.
                 'browser/notifications/notification_browsertest.cc',
                 'browser/notifications/platform_notification_service_browsertest.cc',
               ],
             }],
-            ['OS=="android"', {
-              'sources!': [
-                # Note: List duplicated in GN build.
+          ],
+        }],
+        ['OS=="android"', {
+          'sources!': [
+            # Android does not use the message center-based Notification system.
+            'browser/notifications/message_center_notifications_browsertest.cc',
 
-                # Android does not use the message center-based Notification system.
-                'browser/notifications/message_center_notifications_browsertest.cc',
-
-                # TODO(peter): Enable the Notification browser tests.
-                'browser/notifications/notification_browsertest.cc',
-                'browser/notifications/platform_notification_service_browsertest.cc',
-              ]
-            }],
-          ],
+            # TODO(peter): Enable the Notification browser tests.
+            'browser/notifications/notification_browsertest.cc',
+            'browser/notifications/platform_notification_service_browsertest.cc',
+          ]
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_interactive_ui_test_views_sources)' ],
           'dependencies': [
             '../ui/views/controls/webview/webview_tests.gyp:webview_test_support',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_test_support',
           ],
         }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash_test_support',
+          ],
+        }],
         ['use_aura==0 or chromeos==1', {
           'sources!': [
             '../ui/views/corewm/desktop_capture_controller_unittest.cc',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../ash/ash_resources.gyp:ash_resources',
             '../chromeos/chromeos.gyp:chromeos',
           ],
           'conditions': [
             ['disable_nacl==0 and disable_nacl_untrusted==0', {
               'dependencies': [
                 '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
                 '../components/nacl.gyp:nacl_helper',
                 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
               ],
             }],
           ],
           'sources': [
             '<@(chrome_interactive_ui_test_chromeos_sources)',
           ],
           'sources!': [
-            # Note: List duplicated in GN build.
             '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
             '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
 
             # Use only the _chromeos version on ChromeOS.
             'test/base/view_event_test_platform_part_ash.cc',
           ],
         }, {  # Non-ChromeOS.
           # ChromeOS doesn't use panels, everybody else does.
           'sources': [ '<@(chrome_interactive_ui_test_panels_sources)' ],
           'conditions': [
             [ 'toolkit_views==1', {
               'sources': [
                 '<@(chrome_interactive_ui_test_panels_views_sources)',
               ],
             }],
           ],
         }],
         ['chromeos==1 and branding=="Chrome"', {
           'sources!': [
             # These tests are failing on official cros bots. crbug.com/431450.
-            # Note: list duplicated in GN build.
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '../third_party/wtl/include',
           ],
           'dependencies': [
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
             '../ui/resources/ui_resources.gyp:ui_resources',
@@ skipping 511 matching lines @@
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
             ['exclude', '^browser/ui/webui/options/chromeos/'],
           ],
           'sources!': [
             'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
             'browser/extensions/api/terminal/terminal_private_apitest.cc',
             'browser/invalidation/profile_invalidation_provider_factory_browsertest.cc',
             'browser/net/nss_context_chromeos_browsertest.cc',
+            'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
             'browser/ui/ash/keyboard_controller_browsertest.cc',
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
         }, { # chromeos==1
           'sources!': [
             '../apps/load_and_launch_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
@@ skipping 1157 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }