Add remaining trivial targets for the Linux GN build

This patch adds a whole bunch of small targets that
had either already been done but weren't mentioned
in the 'gn_all' group, or needed to be done.

In theory this should produce no change on any platform
other than Linux, except for one small windows target.

R=brettw@chromium.org
TBR=dtu@chromium.org
BUG=432959
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

Review URL: https://codereview.chromium.org/975123003

Cr-Commit-Position: refs/heads/master@{#319580}

22 files changed, 935 insertions, 165 deletions

diff --git a/BUILD.gn b/BUILD.gn
index e06db5f..53fe10d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -121,10 +121,7 @@ group("gn_all") {
   }
 
   if (use_ozone) {
-    deps += [
-      "//ui/ozone",
-      "//ui/ozone/demo",  # GN only
-    ]
+    deps += [ "//ui/ozone" ]
   }
 
   if (is_win || is_mac || is_chromeos) {
@@ -197,13 +194,174 @@ group("gn_all") {
     if (has_chrome_android_internal) {
       deps += [ "//clank" ]  # TODO(GYP) ??
     }
-  } else if (is_linux) {
+  }
+
+  if (is_linux) {
+    # The following are definitely linux-only.
     deps += [
+      "//breakpad:breakpad_unittests",
+      "//breakpad:dump_syms",
+      "//breakpad:generate_test_dump",
+      "//breakpad:minidump-2-core",
+      "//dbus:dbus_test_server",
       "//dbus:dbus_unittests",
+      "//net:disk_cache_memory_test",
+      "//net:flip_in_mem_edsm_server",
+      "//net:flip_in_mem_edsm_server_unittests",
+      "//net:quic_client",
+      "//net:quic_server",
+      "//sandbox/linux:chrome_sandbox",
       "//sandbox/linux:sandbox_linux_unittests",
+      "//sandbox/linux:sandbox_linux_jni_unittests",
     ]
-  } else if (is_mac) {
+  }
+
+  if (is_linux && !is_chromeos) {
+    deps += [
+      # TODO(GYP): Figure out which of these should (and can) build
+      # under which other conditions.
+      "//base:base_perftests",
+      "//base:base_i18n_perftests",
+      "//base:check_example",
+      "//base:protect_file_posix",
+      "//base:build_utf8_validator_tables",
+      "//breakpad:core-2-minidump",
+      "//breakpad:microdump_stackwalk",
+      "//breakpad:minidump_dump",
+      "//breakpad:minidump_stackwalk",
+      "//build/sanitizers:copy_llvm_symbolizer",
+      "//cc/blink:cc_blink_unittests",
+      "//cc:cc_perftests",
+      "//chrome/test:chrome_app_unittests",
+      "//chrome/test:load_library_perf_tests",
+      "//chrome/test:sync_performance_tests",
+      "//chrome/test/chromedriver:chromedriver",
+      "//chrome/test/chromedriver:chromedriver_tests",
+      "//chrome/tools/profile_reset:jtl_compiler",
+      "//components:components_perftests",
+      "//components/network_hints/browser",
+      "//components/session_manager/core",
+      "//components/webui_generator",
+      "//content/public/app:browser",
+      "//content/public/app:child",
+      "//content/test:content_gl_tests",
+      "//content/test:content_gl_benchmark",
+      "//courgette:courgette",
+      "//courgette:courgette_fuzz",
+      "//courgette:courgette_minimal_tool",
+      "//courgette:courgette_unittests",
+      "//device:device_unittests",
+      "//gin:gin_shell",
+      "//gin:gin_v8_snapshot_fingerprint",
+      "//gin:gin_unittests",
+      "//google_apis:google_apis_unittests",
+      "//google_apis/gcm:mcs_probe",
+      "//gpu:angle_unittests",
+      "//gpu:gl_tests",
+
+      # TODO(GYP): Remove this when the gles2 tests work
+      "//gpu/command_buffer/client:gles2_implementation_no_check",
+
+      "//gpu:gpu_perftests",
+      "//ipc:ipc_perftests",
+      "//media:ffmpeg_regression_tests",  # TODO(GYP) this should be conditional on media_use_ffmpeg
+      "//media:media_perftests",
+      "//media/cast:cast_benchmarks",
+      "//media/cast:generate_barcode_video",
+      "//media/cast:generate_timecode_audio",
+      "//media/cast:tap_proxy",
+      "//mojo/application",
+      "//net:crash_cache",
+      "//net:crl_set_dump",
+      "//net:dns_fuzz_stub",
+      "//net:gdig",
+      "//net:get_server_time",
+
+      #"//net:hpack_example_generator",  # TODO(GYP) rockot in progress
+      #"//net:hpack_fuzz_mutator",  # TODO(GYP) rockot in progress
+      #"//net:hpack_fuzz_wrapper",  # TODO(GYP) rockot in progress
+      #"//net:net_perftests",  # TODO(GYP) rockot in progress
+      "//net:net_watcher",  # TODO(GYP): This should be conditional on use_v8_in_net
+      "//net:stress_cache",
+      "//net:tld_cleanup",
+      "//net:run_testserver",
+      "//net:dump_cache",
+
+      # "//ppapi:pepper_hash_for_uma",  # TODO(GYP): Implement me.
+      "//ppapi:ppapi_perftests",  # TODO(GYP): Are there other ppapi_* test targets?
+      "//skia:filter_fuzz_stub",
+      "//skia:image_operations_bench",
+      "//sync:run_sync_testserver",
+      "//sync:sync_endtoend_tests",
+      "//sync/tools:sync_client",
+      "//sync/tools:sync_listen_notifications",
+      "//testing/gmock:gmock_main",
+      "//third_party/codesighs:maptsvdifftool",
+      "//third_party/libphonenumber:libphonenumber_unittests",
+      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
+      "//tools/gn:generate_test_gn_data",
+      "//tools/perf/clear_system_cache",
+      "//ui/keyboard:keyboard_unittests",
+      "//ui/message_center:message_center_unittests",
+      "//ui/snapshot:snapshot_unittests",
+      "//ui/views/examples:views_examples_with_content_exe",
+
+      # "//v8:v8_snapshot",  # TODO(GYP): visibility?
+      # "//v8:postmortem-metadata",  # TODO(GYP): visibility?
+
+      "//third_party/codesighs:nm2tsv",
+      "//third_party/leveldatabase:env_chromium_unittests",
+      "//third_party/libaddressinput:libaddressinput_unittests",
+      "//third_party/sqlite:sqlite_shell",
+      "//ui/compositor:compositor_unittests",
+    ]
+
+    if (enable_extensions) {
+      deps += [ "//extensions/shell:app_shell" ]
+    }
+
+    if (enable_nacl) {
+      deps += [ "//components/nacl:nacl_loader_unittests" ]
+    }
+
+    if (!is_debug && !is_component_build) {
+      deps += [ "//chrome/tools/service_discovery_sniffer" ]
+    }
+
+    if (toolkit_views) {
+      deps += [ "//ui/app_list:app_list_demo" ]
+    }
+
+    if (use_ash) {
+      deps += [
+        "//ash:ash_shell",
+        "//ash:ash_shell_unittests",
+        "//ash:ash_unittests",
+      ]
+    }
+
+    if (use_aura) {
+      deps += [
+        "//ui/aura:aura_unittests",
+        "//ui/aura:bench",
+        "//ui/aura:demo",
+      ]
+    }
+
+    if (use_x11) {
+      deps += [ "//media:player_x11" ]
+    }
+
+    if (target_cpu != "arm") {
+      deps += [ "//gpu:compositor_model_bench" ]
+    }
+  }
+
+  if (is_mac) {
     deps += [
+      "//breakpad:crash_inspector",
+      "//breakpad:dump_syms",
+      "//breakpad:symupload",
       "//third_party/apple_sample_code",
       "//third_party/molokocacao",
     ]
@@ -265,9 +423,150 @@ group("gn_all") {
 }
 
 group("gn_only") {
+  testonly = true
+
+  if (is_linux && !is_chromeos) {
+    # TODO(GYP): Figure out if any of these should be in gn_all
+    # and figure out how cross-platform they are
+    deps = [
+      ":gn_mojo_targets",
+      "//chrome/browser/resources:extension_resource_demo",
+      "//chrome/installer/util:strings",
+      "//chrome:main_dll",
+      "//chrome/test:load_library_perf_tests",
+      "//chrome/tools/convert_dict",
+      "//components/constrained_window:unit_tests",
+      "//components/enhanced_bookmarks:test_support",
+      "//components/password_manager/content/renderer:browser_tests",
+      "//components/metrics:serialization",
+      "//components/proximity_auth:proximity_auth_unittests",
+      "//components/rappor:unit_tests",
+      "//components/sessions:unit_tests",
+      "//media/blink:media_blink_unittests",
+      "//media/base:base_for_cast_ios",
+      "//media/cast:udp_proxy",
+      "//native_client/src/trusted/platform_qualify:vcpuid",
+      "//native_client/src/trusted/debug_stub:gdb_rsp_unittest",
+      "//storage/browser:dump_file_system",
+      "//third_party/angle:libANGLE",
+      "//third_party/angle:libEGL",
+      "//third_party/angle:libGLESv2",
+      "//third_party/cld_2:cld_2_dynamic_data_tool",
+      "//third_party/leveldatabase:leveldb_arena_test",
+      "//third_party/leveldatabase:leveldb_bloom_test",
+      "//third_party/leveldatabase:leveldb_db_test",
+      "//third_party/leveldatabase:leveldb_crc32c_test",
+      "//third_party/leveldatabase:leveldb_cache_test",
+      "//third_party/leveldatabase:leveldb_env_test",
+      "//third_party/leveldatabase:leveldb_write_batch_test",
+      "//third_party/leveldatabase:leveldb_filter_block_test",
+      "//third_party/leveldatabase:leveldb_version_edit_test",
+      "//third_party/leveldatabase:leveldb_db_bench",
+      "//third_party/leveldatabase:leveldb_log_test",
+      "//third_party/leveldatabase:leveldb_corruption_test",
+      "//third_party/leveldatabase:leveldb_table_test",
+      "//third_party/leveldatabase:leveldb_skiplist_test",
+      "//third_party/leveldatabase:leveldb_filename_test",
+      "//third_party/leveldatabase:leveldb_dbformat_test",
+      "//third_party/pdfium/third_party:freetype",
+      "//third_party/libjingle:peerconnnection_server",
+      "//third_party/libjpeg_turbo:simd",
+      "//third_party/libjpeg_turbo:simd_asm",
+      "//third_party/libsrtp:replay_driver",
+      "//third_party/libsrtp:roc_driver",
+      "//third_party/libsrtp:rtpw",
+      "//third_party/libsrtp:rdbx_driver",
+      "//third_party/libsrtp:srtp_driver",
+      "//third_party/libsrtp:srtp_driver",
+      "//third_party/libsrtp:srtp_test_kernel_driver",
+      "//third_party/libsrtp:srtp_test_cipher_driver",
+      "//third_party/libsrtp:srtp_test_datatypes_driver",
+      "//third_party/libsrtp:srtp_test_aes_calc",
+      "//third_party/libsrtp:srtp_test_env",
+      "//third_party/libsrtp:srtp_test_rand_gen",
+      "//third_party/libsrtp:srtp_test_sha1_driver",
+      "//third_party/libsrtp:srtp_test_stat_driver",
+      "//third_party/opus:opus_compare",
+      "//third_party/opus:opus_demo",
+      "//third_party/opus:test_opus_decode",
+      "//third_party/opus:test_opus_encode",
+      "//third_party/opus:test_opus_api",
+      "//third_party/opus:test_opus_padding",
+      "//third_party/webrtc/system_wrappers:field_trial_default",
+      "//third_party/webrtc/system_wrappers:metrics_default",
+      "//ui/display/types",
+      "//ui/shell_dialogs:shell_dialogs_unittests",
+      "//ui/views/examples:views_examples_exe",
+      "//v8:d8",
+    ]
+    if (enable_nacl) {
+      deps += [ "//native_client/src/trusted/service_runtime:sel_ldr" ]
+    }
+    if (use_ozone) {
+      deps += [ "//ui/ozone/demo" ]
+    }
+    if (is_android) {
+      deps += [ "//build/android/gyp/test:hello_world" ]
+    }
+  }
+}
+
+group("gn_mojo_targets") {
+  testonly = true
+  if (is_linux && !is_chromeos) {
+    # TODO(GYP): Figure out if any of these should be in gn_all
+    # and figure out how cross-platform they are
+    deps = [
+      "//chrome/browser/ui/webui/omnibox:mojo_bindings_python",
+      "//chrome/browser/ui/webui/omnibox:mojo_bindings_dart",
+      "//content/public/common:mojo_bindings_dart",
+      "//content/public/common:mojo_bindings_python",
+      "//content/common:mojo_bindings_dart",
+      "//content/common:mojo_bindings_python",
+      "//content/test:web_ui_test_mojo_bindings_dart",
+      "//content/test:web_ui_test_mojo_bindings_python",
+      "//device/battery:mojo_bindings_python",
+      "//device/battery:mojo_bindings_dart",
+      "//device/vibration:mojo_bindings_dart",
+      "//device/vibration:mojo_bindings_python",
+      "//ipc/mojo:ipc_mojo_perftests",
+      "//ipc/mojo:client_channel_dart",
+      "//ipc/mojo:client_channel_python",
+      "//media/mojo/interfaces:interfaces_dart",
+      "//media/mojo/interfaces:interfaces_python",
+      "//media/mojo/services:cdm_service",
+      "//media/mojo:tests",
+      "//net/interfaces:interfaces_dart",
+      "//net/interfaces:interfaces_python",
+      "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
+      "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_dart",
+      "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python",
+      "//third_party/mojo/src/mojo/public/python:packaged_application",
+      "//third_party/mojo/src/mojo/public/python:packaged_bindings",
+      "//third_party/mojo/src/mojo/public/cpp/application:test_support_standalone",
+      "//third_party/mojo_services/src/accessibility/public/interfaces:interfaces_dart",
+      "//third_party/mojo_services/src/accessibility/public/interfaces:interfaces_python",
+      "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_dart",
+      "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python",
+    ]
+
+    if (!is_debug) {
+      deps += [
+        "//mojo/services/html_viewer:tests",
+        "//mojo/services/network:apptests",
+      ]
+    }
+  }
+}
+
+group("gn_visibility") {
   deps = [
-    "//media/mojo",
-    # "//mojo/services/html_viewer:tests",  # TODO(GYP): Do we need this?
+    # "//build/config/sanitizers:options_sources",
+    # "//third_party/pdfium:pdfium_embeddertests",  # TODO(GYP): visibility?
+    # "//third_party/pdfium:pdfium_unittests",  # TODO(GYP): visibility?
+    # "//ui/resources:repack_ui_test_mac_locale_pack",
+    # "//v8:v8_snapshot",  # TODO(GYP): visibility?
+    # "//v8:postmortem-metadata",  # TODO(GYP): visibility?
   ]
 }
 
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 8eb1c96..3295db9 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1065,6 +1065,63 @@ component("i18n") {
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  test("base_perftests") {
+    sources = [
+      "message_loop/message_pump_perftest.cc",
+
+      # "test/run_all_unittests.cc",
+      "threading/thread_perftest.cc",
+    ]
+    deps = [
+      ":base",
+      "//base/test:test_support",
+      "//base/test:test_support_perf",
+      "//testing/perf",
+      "//testing/gtest",
+    ]
+
+    if (is_android) {
+      deps += [ "//testing/android:native_test_native_code" ]
+    }
+  }
+
+  test("base_i18n_perftests") {
+    sources = [
+      "i18n/streaming_utf8_validator_perftest.cc",
+    ]
+    deps = [
+      ":base",
+      ":i18n",
+      "//base/test:test_support",
+      "//base/test:test_support_perf",
+      "//testing/gtest",
+    ]
+  }
+
+  if (!is_ios) {
+    executable("build_utf8_validator_tables") {
+      sources = [
+        "i18n/build_utf8_validator_tables.cc",
+      ]
+      deps = [
+        ":base",
+        "//third_party/icu:icuuc",
+      ]
+    }
+
+    executable("check_example") {
+      sources = [
+        "check_example.cc",
+      ]
+      deps = [
+        ":base",
+      ]
+    }
+  }
+}
+
 source_set("prefs") {
   sources = [
     "prefs/base_prefs_export.h",
diff --git a/base/base.gyp b/base/base.gyp
index aa77264..a23a8d8 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -846,6 +846,7 @@
       ],  # target_conditions
     },
     {
+      # GN: //base:base_perftests
       'target_name': 'base_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -868,6 +869,7 @@
       ],
     },
     {
+      # GN: //base:base_i18n_perftests
       'target_name': 'base_i18n_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -1075,6 +1077,7 @@
     ['OS!="ios"', {
       'targets': [
         {
+          # GN: //base:check_example
           'target_name': 'check_example',
           'type': 'executable',
           'sources': [
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 656d60e..a09471d 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -34,60 +34,146 @@
       'target_name': 'gn_all',
       'type': 'none',
       'dependencies': [
+        '../base/base.gyp:base_i18n_perftests',
+        '../base/base.gyp:base_perftests',
         '../base/base.gyp:base_unittests',
+        '../base/base.gyp:build_utf8_validator_tables',
+        '../base/base.gyp:check_example',
+        '../base/base.gyp:protect_file_posix',
+        '../breakpad/breakpad.gyp:core-2-minidump',
+        '../breakpad/breakpad.gyp:microdump_stackwalk',
+        '../breakpad/breakpad.gyp:minidump_dump',
+        '../breakpad/breakpad.gyp:minidump_stackwalk',
+        '../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
+        '../cc/cc_tests.gyp:cc_perftests',
         '../cc/cc_tests.gyp:cc_unittests',
+        '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
         '../chrome/chrome.gyp:chrome',
         '../chrome/chrome.gyp:browser_tests',
+        '../chrome/chrome.gyp:chrome_app_unittests',
+        '../chrome/chrome.gyp:chromedriver',
+        '../chrome/chrome.gyp:chromedriver_tests',
+        '../chrome/chrome.gyp:chromedriver_unittests',
         '../chrome/chrome.gyp:interactive_ui_tests',
+        '../chrome/chrome.gyp:load_library_perf_tests',
+        '../chrome/chrome.gyp:service_discovery_sniffer',
         '../chrome/chrome.gyp:sync_integration_tests',
+        '../chrome/chrome.gyp:sync_performance_tests',
         '../chrome/chrome.gyp:unit_tests',
+        '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler',
+        '../components/components.gyp:network_hints_browser',
+        '../components/components.gyp:session_manager_component',
+        '../components/components.gyp:webui_generator',
+        '../components/components_tests.gyp:components_perftests',
         '../components/components_tests.gyp:components_unittests',
-        '../content/content_shell_and_tests.gyp:content_shell',
+        '../components/nacl.gyp:nacl_loader_unittests',
+        '../content/content.gyp:content_app_browser',
+        '../content/content.gyp:content_app_child',
         '../content/content_shell_and_tests.gyp:content_browsertests',
+        '../content/content_shell_and_tests.gyp:content_gl_benchmark',
+        '../content/content_shell_and_tests.gyp:content_gl_tests',
         '../content/content_shell_and_tests.gyp:content_perftests',
+        '../content/content_shell_and_tests.gyp:content_shell',
         '../content/content_shell_and_tests.gyp:content_unittests',
+        '../courgette/courgette.gyp:courgette',
+        '../courgette/courgette.gyp:courgette_fuzz',
+        '../courgette/courgette.gyp:courgette_minimal_tool',
+        '../courgette/courgette.gyp:courgette_unittests',
         '../crypto/crypto.gyp:crypto_unittests',
         '../extensions/extensions_tests.gyp:extensions_browsertests',
         '../extensions/extensions_tests.gyp:extensions_unittests',
+        '../device/device_tests.gyp:device_unittests',
+        '../gin/gin.gyp:gin_v8_snapshot_fingerprint',
+        '../gin/gin.gyp:gin_shell',
+        '../gin/gin.gyp:gin_unittests',
         '../google_apis/gcm/gcm.gyp:gcm_unit_tests',
+        '../google_apis/gcm/gcm.gyp:mcs_probe',
+        '../google_apis/google_apis.gyp:google_apis_unittests',
+        '../gpu/gpu.gyp:angle_unittests',
+        '../gpu/gpu.gyp:gl_tests',
+        '../gpu/gpu.gyp:gpu_perftests',
         '../gpu/gpu.gyp:gpu_unittests',
+        '../ipc/ipc.gyp:ipc_perftests',
         '../ipc/ipc.gyp:ipc_tests',
         '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
         '../jingle/jingle.gyp:jingle_unittests',
+        '../media/media.gyp:ffmpeg_regression_tests',  # TODO(GYP) this should be conditional on media_use_ffmpeg
+        '../media/media.gyp:media_perftests',
         '../media/media.gyp:media_unittests',
+        '../media/cast/cast.gyp:cast_benchmarks',
         '../media/cast/cast.gyp:cast_unittests',
+        '../media/cast/cast.gyp:generate_barcode_video',
+        '../media/cast/cast.gyp:generate_timecode_audio',
         '../mojo/mojo.gyp:mojo',
+        '../mojo/mojo_base.gyp:mojo_application_chromium',
         '../mojo/mojo_base.gyp:mojo_common_unittests',
+        '../net/net.gyp:crash_cache',
+        '../net/net.gyp:crl_set_dump',
+        '../net/net.gyp:dns_fuzz_stub',
+        '../net/net.gyp:dump_cache',
+        '../net/net.gyp:gdig',
+        '../net/net.gyp:get_server_time',
         '../net/net.gyp:net_unittests',
+        '../net/net.gyp:net_watcher',  # TODO(GYP): This should be conditional on use_v8_in_net
+        '../net/net.gyp:run_testserver',
+        '../net/net.gyp:stress_cache',
+        '../net/net.gyp:tld_cleanup',
+        '../ppapi/ppapi_internal.gyp:*',  # TODO(GYP) - list all of the examples explicitly.
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',  # TODO(GYP): Split out the examples and tests
+        '../ppapi/ppapi_internal.gyp:ppapi_unittests',
         '../printing/printing.gyp:printing_unittests',
         '../skia/skia_tests.gyp:skia_unittests',
+        '../skia/skia.gyp:filter_fuzz_stub',
+        '../skia/skia.gyp:image_operations_bench',
         '../sql/sql.gyp:sql_unittests',
+        '../sync/sync.gyp:run_sync_testserver',
+        '../sync/sync.gyp:sync_endtoend_tests',
         '../sync/sync.gyp:sync_unit_tests',
-        '../third_party/WebKit/public/all.gyp:all_blink',
+        '../sync/tools/sync_tools.gyp:sync_client',
+        '../sync/tools/sync_tools.gyp:sync_listen_notifications',
+        '../testing/gmock.gyp:gmock_main',
+        '../third_party/WebKit/public/all.gyp:blink_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../third_party/codesighs/codesighs.gyp:codesighs',
+        '../third_party/codesighs/codesighs.gyp:maptsvdifftool',
+        '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
+        '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+        '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
         '../third_party/pdfium/samples/samples.gyp:pdfium_test',
         '../third_party/smhasher/smhasher.gyp:pmurhash',
         '../third_party/sqlite/sqlite.gyp:sqlite_shell',
         '../tools/gn/gn.gyp:gn',
+        '../tools/gn/gn.gyp:generate_test_gn_data',
         '../tools/gn/gn.gyp:gn_unittests',
+        '../tools/imagediff/image_diff.gyp:image_diff',
+        '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_system_cache',
+        '../tools/telemetry/telemetry.gyp:bitmaptools',
         '../ui/accessibility/accessibility.gyp:accessibility_unittests',
         '../ui/app_list/app_list.gyp:app_list_unittests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
+        '../ui/compositor/compositor.gyp:compositor_unittests',
         '../ui/display/display.gyp:display_unittests',
         '../ui/events/events.gyp:events_unittests',
         '../ui/gfx/gfx_tests.gyp:gfx_unittests',
+        '../ui/keyboard/keyboard.gyp:keyboard_unittests',
+        '../ui/message_center/message_center.gyp:message_center_unittests',
+        '../ui/snapshot/snapshot.gyp:snapshot_unittests',
         '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
+        '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
         '../url/url.gyp:url_unittests',
+        '../v8/tools/gyp/v8.gyp:v8_snapshot',
+        '../v8/tools/gyp/v8.gyp:postmortem-metadata',
       ],
       'conditions': [
         ['enable_extensions==1 and OS!="mac"', {
           'dependencies': [
+            '../extensions/shell/app_shell.gyp:app_shell',
             '../extensions/shell/app_shell.gyp:app_shell_unittests',
           ],
         }],
@@ -98,16 +184,35 @@
         }],
         ['use_x11==1', {
           'dependencies': [
+            '../media/media.gyp:player_x11',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
+          'conditions': [
+            ['target_arch!="arm"', {
+              'dependencies': [
+                '../gpu/tools/tools.gyp:compositor_model_bench',
+              ],
+            }],
+          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
+            '../ui/app_list/app_list.gyp:app_list_demo',
             '../ui/views/views.gyp:views_unittests',
           ],
         }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash_shell',
+            '../ash/ash.gyp:ash_shell_unittests',
+            '../ash/ash.gyp:ash_unittests',
+          ],
+        }],
         ['use_aura==1', {
           'dependencies': [
+            '../ui/aura/aura.gyp:aura_bench',
+            '../ui/aura/aura.gyp:aura_demo',
+            '../ui/aura/aura.gyp:aura_unittests',
             '../ui/wm/wm.gyp:wm_unittests',
           ],
         }],
@@ -124,11 +229,12 @@
         ['OS=="android"', {
           'dependencies': [
             '../base/base.gyp:chromium_android_linker', 
+            '../breakpad/breakpad.gyp:dump_syms',
             '../build/android/rezip.gyp:rezip_apk_jar',
             '../chrome/chrome.gyp:chrome_shell_apk',
             '../chrome/chrome.gyp:chromedriver_webview_shell_apk',
             #"//clank" TODO(GYP) - conditional somehow?
-            '../tools/imagediff/imagediff.gyp:imagediff#host',
+            '../tools/imagediff/image_diff.gyp:image_diff#host',
             '../tools/telemetry/telemetry.gyp:bitmaptools#host',
       
             # TODO(GYP): Remove these when the components_unittests work.
@@ -163,6 +269,8 @@
           'dependencies!': [
             '../breakpad/breakpad.gyp:symupload',
             '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:chromedriver',
+            '../chrome/chrome.gyp:chromedriver_unitests',
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:unit_tests',
@@ -176,64 +284,88 @@
             '../third_party/pdfium/samples/samples.gyp:pdfium_test',
             '../tools/gn/gn.gyp:gn',
             '../tools/gn/gn.gyp:gn_unittests',
+            '../tools/imagediff/image_diff.gyp:image_diff',
+            '../tools/telemetry/telemetry.gyp:bitmaptools',
+            '../tools/gn/gn.gyp:gn',
+            '../tools/gn/gn.gyp:gn_unittests',
             '../ui/app_list/app_list.gyp:app_list_unittests',
             '../url/url.gyp:url_unittests',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_unittests',
+            '../breakpad/breakpad.gyp:dump_syms',
+            '../breakpad/breakpad.gyp:generate_test_dump',
+            '../breakpad/breakpad.gyp:minidump-2-core',
+            '../dbus/dbus.gyp:dbus_test_server',
+            '../dbus/dbus.gyp:dbus_unittests',
+            '../media/cast/cast.gyp:tap_proxy',
+            '../net/net.gyp:disk_cache_memory_test',
+            '../net/net.gyp:flip_in_mem_edsm_server',
+            '../net/net.gyp:flip_in_mem_edsm_server_unittests',
+            '../net/net.gyp:hpack_example_generator',
+            '../net/net.gyp:hpack_fuzz_mutator',
+            '../net/net.gyp:hpack_fuzz_wrapper',
+            '../net/net.gyp:net_perftests',
+            '../net/net.gyp:quic_client',
+            '../net/net.gyp:quic_server',
             '../sandbox/sandbox.gyp:chrome_sandbox',
             '../sandbox/sandbox.gyp:sandbox_linux_unittests',
+            '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests',
          ],
         }],
         ['OS=="mac"', {
           'dependencies': [
+            '../breakpad/breakpad.gyp:crash_inspector',
+            '../breakpad/breakpad.gyp:dump_syms',
+            '../breakpad/breakpad.gyp:symupload',
             '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
             '../third_party/molokocacao/molokocacao.gyp:molokocacao',
 
             # TODO(GYP): remove these when the corresponding root targets work.
-            "//cc/blink",
-            "//components/ui/zoom:ui_zoom",
-            "//content",
-            "//content/test:test_support",
-            "//device/battery",
-            "//device/bluetooth",
-            "//device/nfc",
-            "//device/usb",
-            "//device/vibration",
-            "//media/blink",
-            "//pdf",
-            "//storage/browser",
-            "//third_party/brotli",
-            "//third_party/flac",
-            "//third_party/hunspell",
-            "//third_party/iccjpeg",
-            "//third_party/libphonenumber",
-            "//third_party/ots",
-            "//third_party/qcms",
-            "//third_party/smhasher:murmurhash3",
-            "//third_party/speex",
-            "//third_party/webrtc/system_wrappers",
-            "//ui/native_theme",
-            "//ui/snapshot",
-            "//ui/surface",
+            #"//cc/blink",
+            #"//components/ui/zoom:ui_zoom",
+            #"//content",
+            #"//content/test:test_support",
+            #"//device/battery",
+            #"//device/bluetooth",
+            #"//device/nfc",
+            #"//device/usb",
+            #"//device/vibration",
+            #"//media/blink",
+            #"//pdf",
+            #"//storage/browser",
+            #"//third_party/brotli",
+            #"//third_party/flac",
+            #"//third_party/hunspell",
+            #//third_party/iccjpeg",
+            #"//third_party/libphonenumber",
+            #"//third_party/ots",
+            #"//third_party/qcms",
+            #"//third_party/smhasher:murmurhash3",
+            #"//third_party/speex",
+            #"//third_party/webrtc/system_wrappers",
+            #"//ui/native_theme",
+            #"//ui/snapshot",
+            #"//ui/surface",
           ],
           'dependencies!': [
-            "//chrome",  # TODO(GYP)
-            "//chrome/test:browser_tests",  # TODO(GYP)
-            "//chrome/test:interactive_ui_tests",  # TODO(GYP)
-            "//chrome/test:sync_integration_tests",  # TODO(GYP)
-            "//chrome/test:unit_tests",  # TODO(GYP)
-            "//components:components_unittests",  # TODO(GYP)
-            "//content/test:content_browsertests",  # TODO(GYP)
-            "//content/test:content_perftests",  # TODO(GYP)
-            "//content/test:content_unittests",  # TODO(GYP)
-            "//extensions:extensions_browsertests",  # TODO(GYP)
-            "//extensions:extensions_unittests",  # TODO(GYP)
-            "//net:net_unittests",  # TODO(GYP)
-            "//third_party/usrsctp",  # TODO(GYP)
-            "//ui/app_list:app_list_unittests",  # TODO(GYP)
-            "//ui/gfx:gfx_unittests",  # TODO(GYP)
+            #"//chrome",  # TODO(GYP)
+            #"//chrome/test:browser_tests",  # TODO(GYP)
+            #"//chrome/test:interactive_ui_tests",  # TODO(GYP)
+            #"//chrome/test:sync_integration_tests",  # TODO(GYP)
+            #"//chrome/test:unit_tests",  # TODO(GYP)
+            #"//components:components_unittests",  # TODO(GYP)
+            #"//content/test:content_browsertests",  # TODO(GYP)
+            #"//content/test:content_perftests",  # TODO(GYP)
+            #"//content/test:content_unittests",  # TODO(GYP)
+            #"//extensions:extensions_browsertests",  # TODO(GYP)
+            #"//extensions:extensions_unittests",  # TODO(GYP)
+            #"//net:net_unittests",  # TODO(GYP)
+            #"//third_party/usrsctp",  # TODO(GYP)
+            #"//ui/app_list:app_list_unittests",  # TODO(GYP)
+            #"//ui/gfx:gfx_unittests",  # TODO(GYP)
           ],
         }],
         ['OS=="win"', {
@@ -245,93 +377,11 @@
             "//crypto:crypto_unittests",  # TODO(GYP)
             "//net:net_unittests",  # TODO(GYP)
           ],
-        }],
-      ],
-    },
-    {
-      # This target contains a list of things that actually currently
-      # build in GN, but aren't listed in //:gn_all
-      'target_name': 'add_to_gn_all',
-      'type': 'none',
-      'dependencies': [
-        '../breakpad/breakpad.gyp:microdump_stackwalk',
-        '../breakpad/breakpad.gyp:minidump_dump',
-        '../breakpad/breakpad.gyp:minidump_stackwalk',
-        '../cc/cc_tests.gyp:cc_perftests',
-        '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
-        '../chrome/chrome.gyp:sync_performance_tests',
-        '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler',
-        '../courgette/courgette.gyp:courgette_minimal_tool',
-        '../courgette/courgette.gyp:courgette_unittests',
-        '../extensions/shell/app_shell.gyp:app_shell',
-        '../gin/gin.gyp:gin_unittests',
-        '../google_apis/google_apis.gyp:google_apis_unittests',
-        '../gpu/gpu.gyp:angle_unittests',
-        '../gpu/gpu.gyp:gpu_perftests',
-        '../ipc/ipc.gyp:ipc_perftests',
-        '../media/media.gyp:ffmpeg_regression_tests',  # TODO(GYP) this should be conditional on media_use_ffmpeg
-        '../media/media.gyp:media_perftests',
-        '../net/net.gyp:crash_cache',
-        '../net/net.gyp:crl_set_dump',
-        '../net/net.gyp:dns_fuzz_stub',
-        '../net/net.gyp:dump_cache',
-        '../net/net.gyp:gdig',
-        '../net/net.gyp:get_server_time',
-        '../net/net.gyp:net_watcher',  # TODO(GYP): This should be conditional on use_v8_in_net
-        '../net/net.gyp:run_testserver',
-        '../net/net.gyp:stress_cache',
-        '../net/net.gyp:tld_cleanup',
-        '../ppapi/ppapi_internal.gyp:ppapi_tests', # TODO(GYP): Split out the examples and tests
-        '../third_party/codesighs/codesighs.gyp:maptsvdifftool',
-        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
-        '../ui/compositor/compositor.gyp:compositor_unittests',
-        '../ui/keyboard/keyboard.gyp:keyboard_unittests',
-        '../ui/snapshot/snapshot.gyp:snapshot_unittests',
-      ],
-      'conditions': [
-        ['use_aura==1', {
-          'dependencies': [
-            '../ui/aura/aura.gyp:aura_bench',
-          ],
-        }],
-        ['use_ash==1', {
-          'dependencies': [
-            '../ash/ash.gyp:ash_shell',
-            '../ash/ash.gyp:ash_shell_unittests',
-            '../ash/ash.gyp:ash_unittests',
-          ],
-        }],
-        ['OS=="android"', {
-          'dependencies': [
-            '../breakpad/breakpad.gyp:dump_syms',
-          ],
-        }],
-        ['OS=="linux"', {
-          'dependencies': [
-            '../breakpad/breakpad.gyp:breakpad_unittests',
-            '../breakpad/breakpad.gyp:dump_syms',
-            '../breakpad/breakpad.gyp:generate_test_dump',
-            '../breakpad/breakpad.gyp:minidump-2-core',
-            '../net/net.gyp:disk_cache_memory_test',
-            '../net/net.gyp:flip_in_mem_edsm_server',
-            '../net/net.gyp:flip_in_mem_edsm_server_unittests',
-            '../net/net.gyp:quic_client',
-            '../net/net.gyp:quic_server',
-            '../dbus/dbus.gyp:dbus_unittests',
-          ],
-        }],
-        ['OS!="win"', {
+        }, {
           'dependencies': [
             '../third_party/codesighs/codesighs.gyp:nm2tsv',
           ],
         }],
-        ['OS=="mac"', {
-          'dependencies': [
-            '../breakpad/breakpad.gyp:crash_inspector',
-            '../breakpad/breakpad.gyp:dump_syms',
-            '../breakpad/breakpad.gyp:symupload',
-          ],
-        }],
         ['OS=="android" or OS=="linux"', {
           'dependencies': [
             '../net/net.gyp:disk_cache_memory_test',
@@ -342,28 +392,11 @@
     {
       'target_name': 'gyp_remaining',
       'type': 'none',
-      'dependencies': [
-        ':add_to_gn_all',
-      ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
-            '../base/base.gyp:base_i18n_perftests',
-            '../base/base.gyp:base_perftests',
-            '../base/base.gyp:build_utf8_validator_tables#host',
-            '../base/base.gyp:check_example',
-            '../base/base.gyp:protect_file_posix',
-            '../breakpad/breakpad.gyp:core-2-minidump',
-            '../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
-            '../chrome/chrome.gyp:chrome_app_unittests',
-            '../chrome/chrome.gyp:chromedriver',
-            '../chrome/chrome.gyp:chromedriver_tests',
-            '../chrome/chrome.gyp:chromedriver_unittests',
-            '../chrome/chrome.gyp:load_library_perf_tests',
             '../chrome/chrome.gyp:performance_browser_tests',
-            '../chrome/chrome.gyp:service_discovery_sniffer',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
-            '../components/components.gyp:network_hints_browser',
             '../components/components.gyp:policy_templates',
             '../components/components_tests.gyp:components_browsertests',
             '../components/components_tests.gyp:components_perftests',
@@ -393,7 +426,6 @@
             '../net/net.gyp:net_perftests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma',
-            '../remoting/app_remoting_webapp.gyp:ar_sample_app',
             '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests',
             '../skia/skia.gyp:filter_fuzz_stub',
             '../skia/skia.gyp:image_operations_bench',
@@ -423,7 +455,7 @@
             ['disable_nacl==0 and disable_nacl_untrusted==0', {
               'dependencies': [
                 '../components/nacl.gyp:nacl_loader_unittests',
-                '../mojo/mojo_nacl.gyp:monacl_shell',
+                '../mojo/mojo_nacl.gyp:monacl_shell',  # TODO(GYP) This will be deleted; don't port
                 '../remoting/remoting.gyp:remoting_key_tester',
               ]
             }],
@@ -440,8 +472,10 @@
             }],
             ['remoting==1', {
               'dependencies': [
+                '../remoting/app_remoting_webapp.gyp:ar_sample_app',
                 '../remoting/remoting.gyp:remoting_host',
                 '../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
+                '../remoting/remoting.gyp:remoting_key_tester',
                 '../remoting/remoting.gyp:remoting_me2me_host',
                 '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
                 '../remoting/remoting.gyp:remoting_native_messaging_manifests',
@@ -493,12 +527,6 @@
             }],
           ],
         }],
-        ['use_aura==1', {
-          'dependencies': [
-            '../ui/aura/aura.gyp:aura_demo',
-            '../ui/aura/aura.gyp:aura_unittests',
-          ],
-        }],
       ],
     },
     {
@@ -519,6 +547,6 @@
         'chromium_gpu_debug_builder',
       ],
     },
-      ]
+  ]
 }
 
diff --git a/build/sanitizers/BUILD.gn b/build/sanitizers/BUILD.gn
new file mode 100644
index 0000000..4f81f3e
--- /dev/null
+++ b/build/sanitizers/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright (c) 2015 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.
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  copy("copy_llvm_symbolizer") {
+    if (is_win) {
+      sources = [
+        "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe",
+      ]
+      outputs = [
+        "$root_out_dir/llvm-symbolizer.exe",
+      ]
+    } else {
+      sources = [
+        "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
+      ]
+      outputs = [
+        "$root_out_dir/llvm-symbolizer",
+      ]
+    }
+  }
+}
diff --git a/build/secondary/third_party/cacheinvalidation/BUILD.gn b/build/secondary/third_party/cacheinvalidation/BUILD.gn
index 2e02633..17e4d1c 100644
--- a/build/secondary/third_party/cacheinvalidation/BUILD.gn
+++ b/build/secondary/third_party/cacheinvalidation/BUILD.gn
@@ -81,8 +81,11 @@ static_library("cacheinvalidation") {
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   public_configs = [ ":cacheinvalidation_config" ]
 
-  deps = [
+  public_deps = [
     "src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
+  ]
+
+  deps = [
     "//base",
   ]
 }
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 3977471..e30e8ef 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2605,6 +2605,7 @@
       ],
     },
     {
+      # GN: //chrome/test:chrome_app_unittests
       'target_name': 'chrome_app_unittests',
       'type': 'executable',
       'dependencies': [
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index a397d1c..7fb1595 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1673,4 +1673,71 @@ if (!is_android) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
+
+  if (is_linux && !is_chromeos) {
+    # TODO(GYP): Figure out which of these work and are needed on other
+    # platforms.
+    test("chrome_app_unittests") {
+      sources = [
+        "../app/chrome_watcher_client_unittest_win.cc",
+        "../app/chrome_watcher_client_win.cc",
+        "../app/chrome_watcher_command_line_unittest_win.cc",
+        "../app/chrome_watcher_command_line_win.cc",
+        "../app/delay_load_hook_unittest_win.cc",
+        "../app/delay_load_hook_win.cc",
+        "../app/delay_load_hook_win.h",
+        "../app/signature_validator_win.cc",
+        "../app/signature_validator_win.h",
+        "../app/signature_validator_win_unittest.cc",
+        "../common/crash_keys.cc",
+        "../common/crash_keys.h",
+      ]
+
+      deps = [
+        ":test_support",
+        "//chrome/browser",
+        "//chrome/child",
+        "//base/test:run_all_unittests",
+        "//base/test:test_support",
+      ]
+      if (cld_version == 0 || cld_version == 2) {
+        # Use whatever CLD2 data access mode that the
+        # application embedder is using.
+        deps += [ "//third_party/cld_2:cld2_platform_impl" ]
+      }
+    }
+    # TODO(GYP): Finish me...
+    # source_set("performance_browser_tests") {
+    #   testonly = true
+    #   sources =
+    #     rebase_path(chrome_tests_gypi_values.performance_browser_tests_sources,
+    #                 ".",
+    #                 "//chrome")
+    #   deps = [
+    #     ":perf",
+    #     ":test_support",
+    #     "//base",
+    #     "//base:i18n",
+    #     "//base/test:test_support",
+    #     "//chrome/browser",
+    #     "//chrome/renderer",
+    #     "//media/cast:cast_test_utility",
+    #     "//testing/gtest",
+    #   ]
+    #
+    #   if (!is_win) {
+    #     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",
+    #     ]
+    #   }
+    # }
+  }
 }
diff --git a/chrome/tools/BUILD.gn b/chrome/tools/BUILD.gn
index 0adca4b..12bcbf8 100644
--- a/chrome/tools/BUILD.gn
+++ b/chrome/tools/BUILD.gn
@@ -6,8 +6,10 @@
 # the build.
 group("tools") {
   testonly = true
-  deps = [
-    # TODO(GYP) re-enable this. Currently it's giving linker errors about Mojo.
-    #"//chrome/tools/service_discovery_sniffer",
-  ]
+  if (is_linux && !is_chromeos) {
+    # TODO(GYP): Figure out which of these work and are needed on other platforms.
+    deps = [
+      "//chrome/tools/service_discovery_sniffer",
+    ]
+  }
 }
diff --git a/components/BUILD.gn b/components/BUILD.gn
index d472b0b..1765c1a 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -304,3 +304,62 @@ repack("components_tests_pak") {
     "//ui/strings",
   ]
 }
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+
+  # TODO(GYP): Finish me ...
+  # test("components_browsertests") {
+  #   sources = [
+  #     "autofill/content/browser/risk/fingerprint_browsertest.cc",
+  #     "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
+  #     "dom_distiller/content/distiller_page_web_contents_browsertest.cc",
+  #     "password_manager/content/renderer/credential_manager_client_browsertest.cc",
+  #   ]
+  #
+  #   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+  #
+  #   deps = [
+  #     "//components/resources:components_resources",
+  #     "//components/strings",
+  #     "//components/autofill/content/browser",
+  #     "//components/autofill/content/renderer",
+  #     "//components/dom_distiller/content",
+  #     "//components/dom_distiller/core",
+  #     "//components/password_manager/content/renderer",
+  #     "//testing/gmock",
+  #     "//testing/gtest",
+  #     "//content/public/common",
+  #     "//content/public/renderer",
+  #   ]
+  #
+  #   if (is_android) {
+  #     sources -= [
+  #     ]
+  #   }
+  #   if (is_linux) {
+  #     # content_extractor_browsertest is a standalone content extraction tool built as
+  #     # a MANUAL component_browsertest.
+  #     sources += [
+  #       "dom_distiller/standalone/content_extractor_browsertest.cc",
+  #     ]
+  #   }
+  # }
+
+  test("components_perftests") {
+    sources = [
+      "visitedlink/test/visitedlink_perftest.cc",
+    ]
+
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
+    deps = [
+      "//base",
+      "//base/test:test_support_perf",
+      "//testing/gtest",
+      "//content/test:test_support",
+      "//components/visitedlink/browser",
+    ]
+  }
+}
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 308fd92..b5698dd 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1037,6 +1037,7 @@
     ['OS != "ios" and android_webview_build == 0', {
       'targets': [
         {
+          # GN: //components:components_perftests
           'target_name': 'components_perftests',
           'type': '<(gtest_target_type)',
           'dependencies': [
diff --git a/components/session_manager.gypi b/components/session_manager.gypi
index 828acaa..ee925e8 100644
--- a/components/session_manager.gypi
+++ b/components/session_manager.gypi
@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN: //components/session_manager/core
       'target_name': 'session_manager_component',
       'type': '<(component)',
       'dependencies': [
diff --git a/content/BUILD.gn b/content/BUILD.gn
index be1f456..e31ea82 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -80,3 +80,18 @@ source_set("export") {
     "content/common/content_export.h",
   ]
 }
+
+if (is_win) {
+  source_set("content_startup_helper_win") {
+    sources = [
+      "app/startup_helper_win.cc",
+      "public/app/startup_helper_win.h",
+    ]
+
+    deps = [
+      "//base",
+      "//base:i18n",
+      "//sandbox",
+    ]
+  }
+}
diff --git a/content/content.gyp b/content/content.gyp
index 3d73378..a5d4829 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -31,6 +31,7 @@
     ['OS == "win"', {
       'targets': [
         {
+          # GN: //content:content_startup_helper_win
           'target_name': 'content_startup_helper_win',
           'type': 'static_library',
           'include_dirs': [
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 830464e..7c9d732 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -34,6 +34,7 @@
 # gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings => //gpu/skia_bindings
 
 import("//testing/test.gni")
+import("//build/config/ui.gni")
 
 component("gpu") {
   public_deps = [
@@ -282,3 +283,25 @@ test("angle_unittests") {
     "//third_party/angle:translator_static",
   ]
 }
+
+if (is_linux && !is_chromeos && target_cpu != "arm" && use_x11) {
+  executable("compositor_model_bench") {
+    sources = [
+      "tools/compositor_model_bench/compositor_model_bench.cc",
+      "tools/compositor_model_bench/forward_render_model.cc",
+      "tools/compositor_model_bench/render_model_utils.cc",
+      "tools/compositor_model_bench/render_models.cc",
+      "tools/compositor_model_bench/render_tree.cc",
+      "tools/compositor_model_bench/shaders.cc",
+    ]
+
+    libs = [ "GL" ]
+
+    configs += [ "//build/config/linux:x11" ]
+
+    deps = [
+      "//base",
+      "//ui/gl",
+    ]
+  }
+}
diff --git a/gpu/tools/tools.gyp b/gpu/tools/tools.gyp
index 73ef754..4ea41b7 100644
--- a/gpu/tools/tools.gyp
+++ b/gpu/tools/tools.gyp
@@ -12,6 +12,7 @@
     ['OS == "linux" and target_arch != "arm" and use_x11==1', {
       'targets': [
         {
+          # GN: //gpu:compositor_model_bench
           'target_name': 'compositor_model_bench',
           'type': 'executable',
           'dependencies': [
diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn
index ec91639..2262c7b 100644
--- a/media/cast/BUILD.gn
+++ b/media/cast/BUILD.gn
@@ -376,3 +376,39 @@ executable("udp_proxy") {
     "//net",
   ]
 }
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  test("cast_benchmarks") {
+    sources = [
+      "test/cast_benchmarks.cc",
+      "test/fake_single_thread_task_runner.cc",
+      "test/fake_single_thread_task_runner.h",
+      "test/utility/test_util.cc",
+      "test/utility/test_util.h",
+    ]
+
+    deps = [
+      ":common",
+      ":net",
+      ":receiver",
+      ":sender",
+      ":test_support",
+      "//base/test:test_support",
+      "//net",
+      "//testing/gtest",
+    ]
+  }
+
+  test("tap_proxy") {
+    sources = [
+      "test/utility/tap_proxy.cc",
+    ]
+
+    deps = [
+      ":test_support",
+      "//base",
+      "//media",
+    ]
+  }
+}
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index de57eb8..e222347 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -631,3 +631,28 @@ test("skia_unittests") {
     "//ui/gfx/geometry",
   ]
 }
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  executable("image_operations_bench") {
+    sources = [
+      "ext/image_operations_bench.cc",
+    ]
+
+    deps = [
+      ":skia",
+      "//base",
+    ]
+  }
+
+  executable("filter_fuzz_stub") {
+    sources = [
+      "tools/filter_fuzz_stub/filter_fuzz_stub.cc",
+    ]
+
+    deps = [
+      ":skia",
+      "//base",
+    ]
+  }
+}
diff --git a/sync/tools/BUILD.gn b/sync/tools/BUILD.gn
new file mode 100644
index 0000000..9eefdae
--- /dev/null
+++ b/sync/tools/BUILD.gn
@@ -0,0 +1,63 @@
+# 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("//testing/test.gni")
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  source_set("common") {
+    testonly = true
+
+    sources = [
+      "invalidation_helper.cc",
+      "invalidation_helper.h",
+      "null_invalidation_state_tracker.cc",
+      "null_invalidation_state_tracker.h",
+    ]
+
+    deps = [
+      "//base",
+      "//components/invalidation",
+      "//sync",
+    ]
+  }
+
+  test("sync_listen_notifications") {
+    sources = [
+      "sync_listen_notifications.cc",
+    ]
+
+    defines = [ "SYNC_TEST" ]
+
+    deps = [
+      ":common",
+      "//base",
+      "//components/invalidation",
+      "//jingle:notifier",
+      "//net",
+      "//net:test_support",
+      "//sync",
+      "//sync:test_support_sync_core",
+    ]
+  }
+
+  test("sync_client") {
+    sources = [
+      "sync_client.cc",
+    ]
+
+    defines = [ "SYNC_TEST" ]
+
+    deps = [
+      ":common",
+      "//base",
+      "//components/invalidation",
+      "//jingle:notifier",
+      "//net",
+      "//net:test_support",
+      "//sync",
+      "//sync:test_support_sync_core",
+    ]
+  }
+}
diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp
index 887a5f3..7d97be6 100644
--- a/sync/tools/sync_tools.gyp
+++ b/sync/tools/sync_tools.gyp
@@ -9,6 +9,7 @@
 
   'targets': [
   {
+    # GN: //sync/tools:common
     'target_name': 'sync_tools_helper',
     'type': 'static_library',
     'include_dirs': [
@@ -32,6 +33,7 @@
   },
   # A tool to listen to sync notifications and print them out.
   {
+    # GN: //sync/tools:sync_listen_notifications
     'target_name': 'sync_listen_notifications',
     'type': 'executable',
     'defines': [
@@ -53,6 +55,7 @@
 
   # A standalone command-line sync client.
   {
+    # GN: //sync/tools:sync_client
     'target_name': 'sync_client',
     'type': 'executable',
     'defines': [
diff --git a/tools/perf/clear_system_cache/BUILD.gn b/tools/perf/clear_system_cache/BUILD.gn
new file mode 100644
index 0000000..34cfad3
--- /dev/null
+++ b/tools/perf/clear_system_cache/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2015 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.
+
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  executable("clear_system_cache") {
+    testonly = true
+
+    sources = [
+      "clear_system_cache_main.cc",
+    ]
+
+    deps = [
+      "//base",
+      "//base/test:test_support",
+    ]
+  }
+}
diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn
index 8758ad4..2709e3a 100644
--- a/ui/app_list/BUILD.gn
+++ b/ui/app_list/BUILD.gn
@@ -218,6 +218,45 @@ static_library("test_support") {
   ]
 }
 
+if (is_linux && !is_chromeos) {
+  # TODO(GYP): Figure out which of these work and are needed on other platforms.
+  if (toolkit_views) {
+    executable("app_list_demo") {
+      testonly = true
+
+      sources = [
+        "demo/app_list_demo_views.cc",
+      ]
+
+      deps = [
+        ":app_list",
+        ":test_support",
+        "//base",
+        "//content",
+        "//content/public/browser",
+        "//skia",
+        "//url",
+        "//ui/base",
+        "//ui/events",
+        "//ui/resources",
+        "//ui/resources:ui_test_pak",
+        "//ui/views",
+        "//ui/views_content_client",
+        "//ui/views/controls/webview",
+      ]
+      if (is_win) {
+        configs -= [ "//build/config/win:console" ]
+        configs += [ "//build/config/win:windowed" ]
+
+        deps += [
+          "//sandbox",
+          "//content:content_startup_helper_win",
+        ]
+      }
+    }
+  }
+}
+
 test("app_list_unittests") {
   sources = [
     "app_list_item_list_unittest.cc",