Remove the old task manager view

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 433 matching lines @@
       'browser/sync_file_system/mock_local_change_processor.cc',
       'browser/sync_file_system/mock_local_change_processor.h',
       'browser/sync_file_system/mock_remote_file_sync_service.cc',
       'browser/sync_file_system/mock_remote_file_sync_service.h',
       'browser/tab_contents/view_source_browsertest.cc',
       'browser/task_management/providers/web_contents/background_contents_tag_browsertest.cc',
       'browser/task_management/providers/web_contents/devtools_tag_browsertest.cc',
       'browser/task_management/providers/web_contents/extension_tag_browsertest.cc',
       'browser/task_management/providers/web_contents/subframe_task_browsertest.cc',
       'browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc',
-      'browser/task_manager/task_manager_browsertest.cc',
-      'browser/task_manager/task_manager_browsertest_util.cc',
-      'browser/task_manager/task_manager_browsertest_util.h',
       'browser/themes/theme_service_browsertest.cc',
       'browser/tracing/chrome_tracing_delegate_browsertest.cc',
       'browser/translate/cld_data_harness.cc',
       'browser/translate/cld_data_harness.h',
       'browser/translate/cld_data_harness_factory.cc',
       'browser/translate/cld_data_harness_factory.h',
       'browser/translate/component_cld_data_harness.cc',
       'browser/translate/component_cld_data_harness.h',
       'browser/translate/standalone_cld_data_harness.cc',
       'browser/translate/standalone_cld_data_harness.h',
@@ skipping 129 matching lines @@
       'test/data/webui/history_ui_browsertest.h',
       'test/data/webui/ntp4_browsertest.cc',
       'test/data/webui/ntp4_browsertest.h',
       'test/data/webui/print_preview.cc',
       'test/data/webui/print_preview.h',
       'test/data/webui/webui_resource_browsertest.cc',
       'test/gpu/webgl_infobar_browsertest.cc',
       'test/ppapi/ppapi_browsertest.cc',
       'test/ppapi/ppapi_filechooser_browsertest.cc',
     ],
+    'chrome_browser_tests_old_task_manager_mac_sources': [
+      'browser/task_manager/task_manager_browsertest.cc',

[tapted, 2016/04/26 01:54:04]

These should go in chrome_browser_tests_cocoa_sources so they get excluded when
the `mac_views_browser=1` flag is set

[afakhry, 2016/04/26 22:22:43]

Done.

+      'browser/task_manager/task_manager_browsertest_util.cc',
+      'browser/task_manager/task_manager_browsertest_util.h',
+    ],
     # Tests corresponding to the files in chrome_browser_ui_cocoa_sources.
     # Built on Mac, except when mac_views_browser==1.
     'chrome_browser_tests_cocoa_sources': [
       'browser/ui/cocoa/accelerators_cocoa_browsertest.mm',
       'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
       'browser/ui/cocoa/applescript/window_applescript_test.mm',
       'browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm',
       'browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm',
       'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm',
       'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h',
@@ skipping 443 matching lines @@
       'browser/extensions/extension_test_notification_observer.cc',
       'browser/extensions/updater/extension_cache_fake.cc',
       'browser/extensions/updater/extension_cache_fake.h',
       'browser/extensions/window_open_interactive_apitest.cc',
       'browser/mouseleave_browsertest.cc',
       'browser/password_manager/password_generation_interactive_uitest.cc',
       'browser/password_manager/password_manager_interactive_uitest.cc',
       'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc',
       'browser/renderer_context_menu/render_view_context_menu_browsertest_util.h',
       'browser/site_per_process_interactive_browsertest.cc',
-      'browser/task_manager/task_manager_browsertest_util.cc',
       'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc',
       'browser/ui/browser_focus_uitest.cc',
       'browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm',
       'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm',
       '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',
@@ skipping 619 matching lines @@
             # Interactive tests should use whatever CLD2 data access mode that
             # the application embedder is using.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
         }],
         ['use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:xtst',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
+        ['OS == "mac"', {
+          'sources': [
+            'browser/task_manager/task_manager_browsertest_util.cc',

[tapted, 2016/04/26 01:54:04]

these should be repeated in chrome_interactive_ui_test_cocoa_sources instead of
being repeated in a separate rule here.

[afakhry, 2016/04/26 22:22:43]

Done.

+            'browser/task_manager/task_manager_browsertest_util.h',
+          ],
+        }],
         ['OS=="linux"', {
           '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', {
@@ skipping 566 matching lines @@
             '../third_party/boringssl/boringssl.gyp:boringssl',
           ]
         }, {
           'conditions': [
             ['OS == "linux" or OS == "win"', {
               'sources': [
                 'browser/ui/views/ime/ime_warning_bubble_browsertest.cc',
                 'browser/ui/views/ime/ime_window_browsertest.cc',
               ],
             }]
-          ]
+          ]}
+        ],
+        ['OS == "mac"', {
+          'sources': [
+            '<@(chrome_browser_tests_old_task_manager_mac_sources)',
+          ],
         }],
         ['enable_wifi_display==1', {
           'sources': [
             '<@(chrome_browser_tests_display_source_apitest)',
           ],
         }],
         [ 'cld_version==2', {
           'dependencies': [
             # Because the browser_tests use translate, they need CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
@@ skipping 1306 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }