Address more TODO(GYP) in the GN build.

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 226 matching lines @@
   }
 
   if (enable_extensions) {
     public_deps += [
       "//chrome/common/extensions/api",
       "//extensions:test_support",
     ]
   }
 }
 
-# TODO(GYP): Delete this after we've converted everything to GN.
+# TODO(GYP_GONE): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("telemetry_gpu_test_run") {
   testonly = true
   deps = [
     ":telemetry_gpu_test",
   ]
 }
 
 group("telemetry_gpu_test") {
   testonly = true
@@ skipping 437 matching lines @@
       # crbug.com/230471
       sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
     }
     if (!is_chromeos) {
       sources -= [
         "data/webui/certificate_viewer_dialog_test.js",
         "data/webui/settings/bluetooth_page_browsertest_chromeos.js",
         "data/webui/settings/easy_unlock_browsertest_chromeos.js",
       ]
     }
+    if (is_mac) {
+      sources -= [
+        # TODO(rouslan): This test depends on the custom dictionary UI,
+        # which is disabled on Mac.
+        "../browser/ui/webui/options/edit_dictionary_browsertest.js",
+
+        # TODO(rouslan): This test depends on hunspell and we cannot run it
+        # on Mac, which does not use hunspell by default.
+        "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js",
+      ]
+    }
     if (!enable_app_list) {
       sources -= [ "../browser/ui/webui/app_list/start_page_browsertest.js" ]
     }
     if (!enable_print_preview) {
       sources -= [ "data/webui/print_preview.js" ]
     }
     if (enable_media_router) {
       sources +=
           [ "data/webui/media_router/media_router_elements_browsertest.js" ]
     }
     deps = [
       "//chrome/browser/ui",
       "//skia",
     ]
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
+  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("telemetry_perf_unittests_run") {
     testonly = true
     deps = [
       ":telemetry_perf_unittests",
     ]
   }
 
   group("telemetry_perf_unittests") {
     testonly = true
     deps = [
       "//tools/perf:perf",
     ]
 
     data = [
       # For isolate contract.
       "//testing/scripts/common.py",
       "//testing/xvfb.py",
       "//testing/scripts/run_telemetry_as_googletest.py",
     ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
+  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("telemetry_unittests_run") {
     testonly = true
     deps = [
       ":telemetry_unittests",
     ]
   }
 
   group("telemetry_unittests") {
     testonly = true
@@ skipping 38 matching lines @@
 
       # From telemetry_gpu_unittests.isolate
       "//third_party/pylint/",
       "//third_party/logilab/",
       "//testing/scripts/common.py",
       "//testing/xvfb.py",
       "//testing/scripts/run_telemetry_as_googletest.py",
     ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
+  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("tab_capture_end2end_tests_run") {
     testonly = true
     deps = [
       ":browser_tests",
     ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
+  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("mash_browser_tests_run") {
     testonly = true
     deps = [
       ":mash_browser_tests",
     ]
   }
 
   group("mash_browser_tests") {
     testonly = true
@@ skipping 143 matching lines @@
       "//third_party/mesa:osmesa",
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
     if (!is_mac) {
       data_deps += [ "//chrome:packed_extra_resources" ]
     }
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    # TODO(GYP) if (is_win) {
-    #       ['incremental_chrome_dll==1', {
-    #         'UseLibraryDependencyInputs': "true",
-    # }
-
     if (!enable_one_click_signin) {
       sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc" ]
     }
     if (enable_nacl) {
       sources += [
         "../browser/extensions/extension_nacl_browsertest.cc",
         "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
         "nacl/nacl_browsertest.cc",
         "nacl/nacl_browsertest_uma.cc",
         "nacl/nacl_browsertest_util.cc",
@@ skipping 194 matching lines @@
     if (is_mac) {
       # TODO(mark): We really want this for all non-static library
       # targets, but when we tried to pull it up to the common.gypi
       # level, it broke other things like the ui and startup tests. *shrug*
       ldflags = [ "-Wl,-ObjC" ]
 
       # Other platforms only need
       # chrome_resources.gyp:{packed_extra_resources,packed_resources},
       # and can build this target standalone much faster.
       deps += [
-        #'app_mode_app_support',  TODO(GYP)
         "//chrome",
+        "//chrome/common:app_mode_app_support",
 
-        #'../components/components.gyp:breakpad_stubs',  TODO(GYP)
+        # TODO(GYP) Mac: GYP has this dependency. Uncommenting this line
+        # generates duplicate symbols between
+        #   obj/components/crash/content/app/breakpad_stubs/crash_reporter_client.o
+        #   obj/components/crash/content/app/lib/crash_reporter_client.o
+        # It's not clear how this is supposed to work. The intent seems to be
+        # to not link breakpad in the tests. The dependency on .../app:lib
+        # seems to come from //chrome/app:test_support. That reference maybe
+        # should be a dependency on the stubs instead because it could be all
+        # tests might want them. Or it could be that we need to make a new
+        # "headers" target to make GN check happy, and then force each
+        # executable to link the correct implementation. Somebody with a
+        # higher-level understanding of Mac crash reporting needs to think
+        # about this.
+        # "//components/crash/content/app:breakpad_stubs",
         "//third_party/ocmock",
       ]
       sources += [
         "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm",
         "../browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc",
       ]
       sources -= [
         # TODO(groby): This test depends on hunspell and we cannot run it on
         # Mac, which does not use hunspell by default.
         "../browser/spellchecker/spellcheck_service_browsertest.cc",
 
-        # TODO(rouslan): This test depends on the custom dictionary UI,
-        # which is disabled on Mac.
-        # TODO(GYP): This should be added somewhere first ...
-        # "../browser/ui/webui/options/edit_dictionary_browsertest.js",
-
-        # TODO(rouslan): This test depends on hunspell and we cannot run it
-        # on Mac, which does use hunspell by default.
-        # TODO(GYP): This should be added somewhere first ...
-        # "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js",
-
         # ProcessSingletonMac doesn"t do anything.
         "../browser/process_singleton_browsertest.cc",
 
         # This test depends on GetCommandLineForRelaunch, which is not
         # available on Mac.
         "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
 
         # single-process mode hangs on Mac sometimes because of multiple UI
         # message loops. See 306348
         "../renderer/safe_browsing/phishing_classifier_browsertest.cc",
@@ skipping 113 matching lines @@
         "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
       ]
     }
     if (is_android || is_ios) {
     }
     if (enable_remoting) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
               ".",
               "//chrome")
-      #deps += [ "//remoting:remoting_webapp" ]  TODO(GYP)
+      deps += [ "//remoting/webapp" ]
     }
     if (use_x11) {
       deps += [ "//tools/xdisplaycheck" ]
     }
 
     if (use_aura) {
       sources += [
         "base/mash_browser_tests_main.cc",
         "base/mash_browser_tests_main.h",
         "base/mojo_test_connector.cc",
@@ skipping 305 matching lines @@
     "//third_party/cld_2:cld2_static",
     "//third_party/icu",
     "//third_party/libxml",
     "//ui/base:test_support",
     "//ui/display:test_support",
     "//ui/gfx:test_support",
     "//ui/resources",
   ]
   data_deps = []
 
-  # TODO(GYP) Windows stuff
-  # ['incremental_chrome_dll==1', {
-  #   'UseLibraryDependencyInputs': "true",
-
   if (!is_ios) {
     deps += [
       "//components/autofill/content/renderer:test_support",
       "//components/data_reduction_proxy/core/browser:test_support",
       "//components/data_use_measurement/core",
       "//components/metrics/proto",
       "//components/safe_browsing_db",
       "//components/safe_json:test_support",
       "//components/strings",
       "//components/webdata_services:test_support",
       "//content/app/resources",
       "//device/bluetooth:mocks",
       "//device/core:mocks",
       "//device/usb:mocks",
       "//gpu:test_support",
       "//media:test_support",
-
-      #'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',  TODO(GYP)
       "//third_party/leveldatabase",
       "//third_party/libaddressinput",
       "//third_party/libjingle",
       "//third_party/libphonenumber",
       "//third_party/webrtc/modules/desktop_capture",
       "//tools/json_schema_compiler/test",
       "//ui/gl",
       "//v8",
     ]
   }
@@ skipping 522 matching lines @@
       "$_output_dir/hfsx_case_sensitive.img",
       "$_output_dir/mach_o_in_dmg.dmg",
     ]
     args = [
       rebase_path(shell_script, root_out_dir),
       rebase_path(_output_dir, root_out_dir),
     ]
   }
 }
 
-if (is_win || is_mac || is_linux) {
-  # TODO(GYP): Figure out which of these work and are needed on other
-  # platforms.
+if (!is_android) {
+  # TODO(609855): Make this compile on Android and run on the bots.
   test("chrome_app_unittests") {
     sources = [
       "../app/chrome_watcher_client_unittest_win.cc",
       "../app/chrome_watcher_client_win.cc",
       "../app/chrome_watcher_command_line_win.cc",
       "../app/chrome_watcher_command_line_win_unittest.cc",
       "../app/delay_load_hook_unittest_win.cc",
       "../app/delay_load_hook_win.cc",
       "../app/delay_load_hook_win.h",
       "../app/resources/resources_unittest.cc",
@@ skipping 42 matching lines @@
       "//third_party/cld_2:cld2_platform_impl",
     ]
 
     if (is_win) {
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
     } else {
       sources -= [
         "../app/chrome_command_ids.h",
-
-        #"../app/chrome_dll.rc",
-        #"../app/chrome_dll_resource.h",
         "../app/chrome_version.rc.version",
       ]
     }
     if (!is_mac) {
       sources -= [ "perf/mach_ports_performancetest.cc" ]
     }
   }
 }
 
 source_set("test_support_unit") {
@@ skipping 25 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }