BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 304 insertions, 436 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 1ede84009a2..9bce97bcaf7 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -8,11 +8,13 @@
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
-import("//build/config/crypto.gni")
 import("//build/config/features.gni")
+import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
-import("//build/module_args/v8.gni")
+import("//build_overrides/v8.gni")
+import("//build_overrides/webrtc.gni")
 import("//media/media_options.gni")
+import("//third_party/openh264/openh264_args.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ -25,7 +27,7 @@ declare_args() {
   root_extra_deps = []
 }
 
-# This file defines the following four main targets:
+# This file defines the following five main targets:
 #
 # "both_gn_and_gyp" should list every root target (target that nothing else
 # depends on) built by GN that is also built in the GYP build.
@@ -33,19 +35,29 @@ declare_args() {
 # "gn_all" should (transitively) cause everything to be built; if you run
 # 'ninja gn_all' and then 'ninja all', the second build should do no work.
 #
-# "gn_only" should list every root target that is *not* intended to be built
-# in a GYP build. Because GN has different rules for deciding what an 'all'
-# build is, this may end up including targets that are actually defined in a
-# GYP build but not dependencies of GYP's "all" (and so not actually built).
+# "gn_only" should list every root target that is *not* intended to be built in
+# a GYP build. Because GN has different rules for deciding what an 'all' build
+# is, this may end up including targets that are actually defined in a GYP
+# build but not dependencies of GYP's "all" (and so not actually built).
 #
 # "gn_visibility": targets that are normally not visible to top-level targets,
-# but are built anyway by "all". Since we don't want any such targets, we
-# have this placeholder to make sure hidden targets that aren't otherwise
-# depended on yet are accounted for.
+# but are built anyway by "all". Since we don't want any such targets, we have
+# this placeholder to make sure hidden targets that aren't otherwise depended
+# on yet are accounted for.
+#
+# "All" is an alias for "gn_all". It exists for bot compatibility w/ GYP for
+# the iOS bots and the official builders, but should not be generally used
+# during the GYP->GN migration.  We cannot guarantee that GN's "All" builds the
+# same set of targets as GYP's "All" does, because GYP's "All" supports
+# wildcards.
+#
+# Lastly, none of these targets are guaranteed to be the same as what ninja
+# will build with "all". For more on how "all" works and the differences in how
+# GYP and GN determine "all", see crbug.com/503241.
 #
 # TODO(GYP): crbug.com/481694. Make sure that the above is true and there are
-# scripts run on the bots that enforce this. Once the GYP migration is over,
-# we can collapse all of these targets as desired.
+# scripts run on the bots that enforce this. Once the GYP migration is over, we
+# can collapse all of these targets as desired.
 
 group("gn_all") {
   testonly = true
@@ -57,6 +69,16 @@ group("gn_all") {
   ]
 }
 
+# TODO(GYP): This target exists for compatibility with GYP, specifically
+# for the iOS bots and the official builders.
+group("All") {
+  testonly = true
+
+  deps = [
+    ":gn_all",
+  ]
+}
+
 # The "both_gn_and_gyp" target should reflect every target that is built
 # in both the GN and GYP builds, and ideally it should match the
 # "both_gn_and_gyp" target in build/gn_migration.gypi line-for-line.
@@ -77,42 +99,22 @@ group("both_gn_and_gyp") {
     "//url:url_unittests",
   ]
 
-  if (!is_ios) {
-    # TODO(GYP): Figure out which of these should actually build on iOS,
-    # and whether there should be other targets that are iOS-only and missing.
+  if (!is_ios && !is_android && !is_chromecast) {
     deps += [
-      "//cc:cc_unittests",
       "//chrome",
       "//chrome/test:browser_tests",
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",
-      "//chrome/test:unit_tests",
       "//chrome/test/chromedriver:chromedriver_unittests",
-      "//components:components_browsertests",
-      "//content/shell:content_shell",
-      "//content/test:content_browsertests",
-      "//content/test:content_perftests",
-      "//content/test:content_unittests",
       "//crypto:crypto_unittests",
-      "//device:device_unittests",
       "//extensions:extensions_browsertests",
       "//extensions:extensions_unittests",
       "//google_apis/gcm:gcm_unit_tests",
-      "//gpu:gpu_unittests",
       "//gpu/gles2_conform_support:gles2_conform_test",
-      "//ipc:ipc_tests",
-      "//ipc/mojo:ipc_mojo_unittests",
       "//jingle:jingle_unittests",
-      "//media:media_unittests",
-      "//media/cast:cast_unittests",
-      "//media/midi:midi_unittests",
-      "//mojo",
-      "//mojo/application/public/cpp",
-      "//mojo/common:mojo_common_unittests",
       "//net:hpack_example_generator",
       "//net:hpack_fuzz_mutator",
       "//net:hpack_fuzz_wrapper",
-      "//net:net_perftests",
       "//ppapi:ppapi_unittests",
       "//ppapi/examples/2d",
       "//ppapi/examples/audio",
@@ -143,12 +145,39 @@ group("both_gn_and_gyp") {
       "//ppapi/examples/video_effects",
       "//ppapi/examples/video_encode",
       "//printing:printing_unittests",
-      "//third_party/WebKit/Source/platform:heap_unittests",
-      "//third_party/WebKit/Source/platform:platform_unittests",
-      "//third_party/WebKit/Source/web:webkit_unit_tests",
-      "//third_party/WebKit/Source/wtf:wtf_unittests",
       "//third_party/cacheinvalidation:cacheinvalidation_unittests",
       "//third_party/codesighs",
+      "//third_party/pdfium/samples:pdfium_test",
+      "//tools/gn",
+      "//tools/gn:gn_unittests",
+      "//tools/perf/clear_system_cache",
+      "//ui/accessibility:accessibility_unittests",
+      "//ui/app_list:app_list_unittests",
+    ]
+  }
+
+  if (!is_ios) {
+    # TODO(GYP): Figure out which of these should actually build on iOS,
+    # and whether there should be other targets that are iOS-only and missing.
+    deps += [
+      "//cc:cc_unittests",
+      "//chrome/test:unit_tests",
+      "//components:components_browsertests",
+      "//content/shell:content_shell",
+      "//content/test:content_browsertests",
+      "//content/test:content_perftests",
+      "//content/test:content_unittests",
+      "//device:device_unittests",
+      "//gpu:gpu_unittests",
+      "//ipc:ipc_tests",
+      "//ipc/mojo:ipc_mojo_unittests",
+      "//media:media_unittests",
+      "//media/cast:cast_unittests",
+      "//media/midi:midi_unittests",
+      "//mojo",
+      "//mojo/common:mojo_common_unittests",
+      "//mojo/shell/public/cpp",
+      "//net:net_perftests",
 
       # TODO(use-new-edk):
       #"//mojo/edk/system:mojo_system_unittests",
@@ -156,32 +185,50 @@ group("both_gn_and_gyp") {
       #"//mojo/edk/test:mojo_public_environment_unittests",
       #"//mojo/edk/test:mojo_public_system_unittests",
       #"//mojo/edk/test:mojo_public_utility_unittests",
+      "//third_party/WebKit/Source/platform:blink_heap_unittests",
+      "//third_party/WebKit/Source/platform:blink_platform_unittests",
+      "//third_party/WebKit/Source/web:webkit_unit_tests",
+      "//third_party/WebKit/Source/wtf:wtf_unittests",
       "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
-      "//third_party/pdfium/samples:pdfium_test",
       "//third_party/smhasher:pmurhash",
       "//tools/imagediff($host_toolchain)",
-      "//tools/gn",
-      "//tools/gn:gn_unittests",
-      "//tools/gn:generate_test_gn_data",
-      "//tools/perf/clear_system_cache",
       "//tools/telemetry:bitmaptools($host_toolchain)",
-      "//ui/accessibility:accessibility_unittests",
-      "//ui/app_list:app_list_unittests",
       "//ui/display:display_unittests",
       "//ui/events:events_unittests",
       "//ui/gl:gl_unittests",
       "//ui/touch_selection:ui_touch_selection_unittests",
     ]
+  } else {
+    deps += [
+      "//ios/net:ios_net_unittests",
+      "//ios/public/provider/web",
+      "//ios/testing:ocmock_support_unittest",
+      "//ios/web:ios_web_unittests",
+      "//ios/web/shell:ios_web_shell",
+    ]
+
+    if (ios_use_webrtc) {
+      deps += [
+        "//ios/chrome:ios_chrome_unittests",
+        "//ios/chrome/app",
+        "//ios/chrome/browser",
+        "//ios/chrome/common",
+        "//ios/public/provider/chrome/browser",
+      ]
+    }
+  }
+
+  if (is_mac || is_win || is_linux) {
+    deps += [ "//tools/battor_agent" ]
   }
 
   deps += root_extra_deps
 
-  if (enable_extensions && !is_mac) {
-    # TODO(GYP): Get this working on the mac?
+  if (enable_extensions) {
     deps += [ "//extensions/shell:app_shell_unittests" ]
   }
 
@@ -218,115 +265,79 @@ group("both_gn_and_gyp") {
   }
 
   if (is_win) {
-    deps += [ "//chrome/tools/build/win/syzygy:chrome_dll_syzygy" ]
+    deps += [
+      "//chrome/installer/gcapi",
+      "//chrome/tools/build/win/syzygy:chrome_dll_syzygy",
+    ]
   }
 
   if (is_android) {
     deps += [
+      "//base:base_junit_tests",
       "//base/android/linker:chromium_android_linker",
       "//build/android/gyp/test:hello_world",
       "//build/android/rezip",
-      "//third_party/errorprone:chromium_errorprone",
-      "//tools/android:android_tools",
-      "//tools/imagediff($host_toolchain)",
-
-      # TODO(GYP): Remove these when the components_unittests work.
-      "//components/history/core/test:test",
-      "//components/policy:policy_component_test_support",
-      "//components/policy:test_support",
-      "//components/rappor:test_support",
-      "//components/signin/core/browser:test_support",
-      "//components/sync_driver:test_support",
-      "//components/user_manager",
-      "//components/wallpaper",
+      "//components/invalidation/impl:components_invalidation_impl_junit_tests",
+      "//components/policy/android:components_policy_junit_tests",
+      "//content/public/android:content_junit_tests",
       "//content/shell/android:content_shell_apk",
-
-      # TODO(GYP): Are these needed, or will they be pulled in automatically?
-      "//third_party/android_tools:android_gcm_java",
+      "//content/test:video_decode_accelerator_unittest",
+      "//net/android:net_junit_tests",
+      "//testing/android/junit:junit_unittests",
       "//third_party/android_tools:uiautomator_java",
-      "//third_party/android_tools:android_support_v13_java",
-      "//third_party/android_tools:android_support_v7_appcompat_java",
-      "//third_party/android_tools:android_support_v7_mediarouter_java",
-      "//third_party/mesa",
-      "//third_party/mockito:mockito_java",
-      "//third_party/openmax_dl/dl",
-      "//ui/android:ui_java",
-
-      # TODO(GYP): Are these needed?
-      "//chrome/test:test_support_unit",
+      "//third_party/errorprone:chromium_errorprone",
       "//third_party/smhasher:murmurhash3",
-      "//ui/message_center:test_support",
+      "//tools/android:android_tools",
+      "//tools/android:memconsumer",
+      "//tools/android/heap_profiler:heap_profiler_unittests",
+      "//tools/android/kerberos/SpnegoAuthenticator:spnego_authenticator_apk",
+      "//tools/cygprofile:cygprofile_unittests",
+      "//tools/imagediff($host_toolchain)",
     ]
     deps -= [
-      "//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)
-
-      # Chromedriver shouldn't be compiled on Android.
-      "//chrome/test/chromedriver:chromedriver_unittests",
-      "//extensions:extensions_browsertests",
-      "//extensions:extensions_unittests",
-      "//google_apis/gcm:gcm_unit_tests",
-      "//ipc:ipc_tests",  # TODO(GYP) ??
-      "//jingle:jingle_unittests",  # TODO(GYP) ??
-      "//net:hpack_example_generator",
-      "//net:hpack_fuzz_mutator",
-      "//net:hpack_fuzz_wrapper",
       "//net:net_perftests",
-      "//ppapi/examples/2d",
-      "//ppapi/examples/audio",
-      "//ppapi/examples/audio_input",
-      "//ppapi/examples/compositor",
-      "//ppapi/examples/crxfs",
-      "//ppapi/examples/enumerate_devices",
-      "//ppapi/examples/file_chooser",
-      "//ppapi/examples/flash_topmost",
-      "//ppapi/examples/font",
-      "//ppapi/examples/gamepad",
-      "//ppapi/examples/gles2",
-      "//ppapi/examples/gles2_spinning_cube",
-      "//ppapi/examples/ime",
-      "//ppapi/examples/input",
-      "//ppapi/examples/media_stream_audio",
-      "//ppapi/examples/media_stream_video",
-      "//ppapi/examples/mouse_cursor",
-      "//ppapi/examples/mouse_lock",
-      "//ppapi/examples/printing",
-      "//ppapi/examples/scaling",
-      "//ppapi/examples/scripting",
-      "//ppapi/examples/stub",
-      "//ppapi/examples/threading",
-      "//ppapi/examples/url_loader",
-      "//ppapi/examples/video_capture",
-      "//ppapi/examples/video_decode",
-      "//ppapi/examples/video_effects",
-      "//ppapi/examples/video_encode",
-      "//third_party/pdfium/samples:pdfium_test",
-      "//tools/gn",
-      "//tools/gn:generate_test_gn_data",
-      "//tools/gn:gn_unittests",
-      "//ui/app_list:app_list_unittests",
       "//url:url_unittests",
     ]
 
+    if (!is_component_build) {
+      deps += [
+        "//components/cronet/android:cronet_package",
+        "//components/cronet/android:cronet_sample_apk",
+        "//components/cronet/android:cronet_sample_test_apk",
+        "//components/cronet/android:cronet_test_apk",
+        "//components/cronet/android:cronet_test_instrumentation_apk",
+        "//components/cronet/android:cronet_unittests",
+      ]
+    }
+
     if (!is_chromecast) {
       deps += [
+        "//android_webview",
+        "//android_webview/test",
+        "//android_webview/tools",
+        "//chrome/android:chrome_junit_tests",
         "//chrome/android:chrome_public_apk",
         "//chrome/android:chrome_public_test_apk",
         "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk",
+        "//content/shell/android:content_shell_test_apk",
+        "//third_party/custom_tabs_client:custom_tabs_client_example_apk",
       ]
     }
 
+    if (target_cpu != "x64") {
+      deps += [ "//third_party/android_platform:android_relocation_packer_unittests($host_toolchain)" ]
+    }
+
     if (has_chrome_android_internal) {
       deps += [ "//clank" ]  # TODO(GYP) ??
     }
   }
 
-  if (is_linux) {  # TODO(GYP): || is_android || is_bsd?
+  if (is_linux || is_android) {  # TODO(GYP): || is_bsd?
     deps += [
+      "//breakpad:breakpad_unittests",
       "//breakpad:core-2-minidump",
+      "//breakpad:generate_test_dump",
       "//breakpad:minidump-2-core",
     ]
   }
@@ -349,8 +360,8 @@ group("both_gn_and_gyp") {
   if (is_linux) {
     # The following are definitely linux-only.
     deps += [
-      "//breakpad:breakpad_unittests",
-      "//breakpad:generate_test_dump",
+      "//chrome:manpage",
+      "//chrome:xdg_mime",
       "//dbus:dbus_test_server",
       "//dbus:dbus_unittests",
       "//net:disk_cache_memory_test",
@@ -360,12 +371,16 @@ group("both_gn_and_gyp") {
       "//net:quic_server",
       "//sandbox/linux:chrome_sandbox",
       "//sandbox/linux:sandbox_linux_unittests",
-      "//sandbox/linux:sandbox_linux_jni_unittests",
     ]
 
     if (is_chromeos || use_ash) {
       deps += [ "//components/session_manager/core" ]
     }
+
+    if (is_chrome_branded && is_official_build) {
+      # TODO(dpranke): add the linux_dump_symbols flag?
+      deps += [ "//chrome:linux_symbols" ]
+    }
   }
 
   if (is_ios || is_win || (is_linux && !is_chromeos)) {
@@ -376,68 +391,85 @@ group("both_gn_and_gyp") {
     ]
   }
 
-  if (is_win || (is_linux && !is_chromeos)) {
-    # TODO(GYP): Figure out which of these should (and can) build
-    # for android/chromeos/mac/ios.
+  if (is_android || is_win || (is_linux && !is_chromeos)) {
     deps += [
-      "//base:check_example",
       "//base:build_utf8_validator_tables",
+      "//base:check_example",
       "//cc:cc_perftests",
       "//cc/blink:cc_blink_unittests",
-      "//chrome/test:load_library_perf_tests",
-      "//chrome/test:performance_browser_tests",
-      "//chrome/test:sync_performance_tests",
-      "//chrome/test/chromedriver:chromedriver",
-      "//chrome/test/chromedriver:chromedriver_tests",
-      "//chrome/tools/profile_reset:jtl_compiler",
       "//components:components_perftests",
-      "//content/test:content_gl_tests",
       "//content/test:content_gl_benchmark",
-      "//courgette:courgette",
-      "//courgette:courgette_fuzz",
-      "//courgette:courgette_minimal_tool",
-      "//courgette:courgette_unittests",
+      "//content/test:content_gl_tests",
       "//device:device_unittests",
       "//gin:gin_shell",
       "//gin:gin_unittests",
       "//google_apis/gcm:mcs_probe",
-      "//gpu:gpu_perftests",
       "//gpu:gl_tests",
+      "//gpu:gpu_perftests",
       "//ipc:ipc_perftests",
       "//media:media_perftests",
-      "//media/cast:generate_barcode_video",
-      "//media/cast:generate_timecode_audio",
-      "//net:crash_cache",
-      "//net:crl_set_dump",
-      "//net:dns_fuzz_stub",
       "//net:dump_cache",
-      "//net:gdig",
-      "//net:get_server_time",
-      "//net:net_watcher",  # TODO(GYP): This should be conditional on use_v8_in_net
-      "//net:run_testserver",
-      "//net:stress_cache",
-      "//net:tld_cleanup",
-      "//ppapi:pepper_hash_for_uma",
-      "//ppapi:ppapi_perftests",
       "//sync:run_sync_testserver",
-      "//third_party/angle/src/tests:angle_end2end_tests",
-      "//third_party/angle/src/tests:angle_unittests",
       "//third_party/codesighs:maptsvdifftool",
-      "//third_party/leveldatabase:env_chromium_unittests",
-      "//third_party/libaddressinput:libaddressinput_unittests",
       "//third_party/libphonenumber:libphonenumber_unittests",
       "//ui/compositor:compositor_unittests",
     ]
 
+    # TODO(GYP): Figure out which of these should (and can) build
+    # for chromeos/mac/ios.
+    if (!is_android) {
+      deps += [
+        "//chrome/test:load_library_perf_tests",
+        "//chrome/test:sync_performance_tests",
+        "//chrome/test/chromedriver:chromedriver",
+        "//chrome/test/chromedriver:chromedriver_tests",
+        "//courgette:courgette",
+        "//courgette:courgette_fuzz",
+        "//courgette:courgette_minimal_tool",
+        "//courgette:courgette_unittests",
+        "//media/cast:generate_barcode_video",
+        "//media/cast:generate_timecode_audio",
+        "//net:crash_cache",
+        "//net:crl_set_dump",
+        "//net:dns_fuzz_stub",
+        "//net:gdig",
+        "//net:get_server_time",
+        "//net:net_watcher",  # TODO(GYP): This should be conditional on use_v8_in_net
+        "//net:run_testserver",
+        "//net:stress_cache",
+        "//net:tld_cleanup",
+        "//ppapi:pepper_hash_for_uma",
+        "//ppapi:ppapi_perftests",
+        "//third_party/angle/src/tests:angle_unittests",
+        "//third_party/leveldatabase:env_chromium_unittests",
+        "//third_party/libaddressinput:libaddressinput_unittests",
+      ]
+    }
+    if (!is_android && !is_linux) {
+      # TODO(dpranke): Re-enable this once
+      # https://chromium-review.googlesource.com/#/c/312298/1 is rolled
+      # into chromium.
+      deps += [ "//third_party/angle/src/tests:angle_end2end_tests" ]
+    }
+
     if (enable_extensions) {
       deps += [ "//extensions/shell:app_shell" ]
     }
 
     if (enable_nacl) {
-      deps += [ "//components/nacl:nacl_loader_unittests" ]
+      deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
+
+      if (is_linux) {
+        # TODO(dpranke): Figure out what platforms should actually have this.
+        deps += [
+          "//components/nacl/loader:helper_nonsfi",
+          "//components/nacl/loader:helper_nonsfi_unittests",
+          "//components/nacl/loader:nacl_helper",
+        ]
+      }
     }
 
-    if (media_use_ffmpeg) {
+    if (media_use_ffmpeg && !is_android) {
       deps += [ "//media:ffmpeg_regression_tests" ]
     }
 
@@ -457,12 +489,14 @@ group("both_gn_and_gyp") {
     }
   }
 
-  if (is_linux && !is_chromeos) {
+  if (is_android || (is_linux && !is_chromeos)) {
     deps += [
       # TODO(GYP): Figure out which of these should (and can) build
       # under which other conditions.
-      "//build/sanitizers:copy_llvm_symbolizer",
-      "//chrome/test:chrome_app_unittests",
+      "//breakpad:dump_syms($host_toolchain)",
+      "//breakpad:microdump_stackwalk($host_toolchain)",
+      "//breakpad:minidump_dump($host_toolchain)",
+      "//breakpad:minidump_stackwalk($host_toolchain)",
       "//cloud_print:cloud_print_unittests",
       "//components/network_hints/browser",
       "//content/public/app:browser",
@@ -470,38 +504,36 @@ group("both_gn_and_gyp") {
 
       # TODO(GYP): Remove this when the gles2 tests work
       "//gpu/command_buffer/client:gles2_implementation_no_check",
-
       "//gpu/khronos_glcts_support:khronos_glcts_test",  # TODO(GYP) crbug.com/471903 to make this complete.
-      "//media/cast:cast_benchmarks",
-      "//media/cast:tap_proxy",
-      "//mojo/application/public/cpp",
-      "//skia:filter_fuzz_stub",
-      "//skia:image_operations_bench",
-      "//sync/tools:sync_client",
-      "//sync/tools:sync_listen_notifications",
+      "//mojo/shell/public/cpp",
       "//testing/gmock:gmock_main",
 
       # TODO(use-new-edk):
       #"//mojo/edk/test:mojo_public_system_perftests",
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
-      "//ui/keyboard:keyboard_unittests",
-      "//ui/message_center:message_center_unittests",
-      "//ui/snapshot:snapshot_unittests",
-      "//ui/views/examples:views_examples_with_content_exe",
-
       "//third_party/codesighs:nm2tsv",
-      "//third_party/sqlite:sqlite_shell",
+      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
     ]
 
-    deps += [
-      "//breakpad:dump_syms($host_toolchain)",
-      "//breakpad:microdump_stackwalk($host_toolchain)",
-      "//breakpad:minidump_dump($host_toolchain)",
-      "//breakpad:minidump_stackwalk($host_toolchain)",
-    ]
+    if (!is_android) {
+      deps += [
+        "//build/sanitizers:copy_llvm_symbolizer",
+        "//chrome/test:chrome_app_unittests",
+        "//media/cast:cast_benchmarks",
+        "//media/cast:tap_proxy",
+        "//skia:filter_fuzz_stub",
+        "//skia:image_operations_bench",
+        "//sync/tools:sync_client",
+        "//sync/tools:sync_listen_notifications",
+        "//third_party/sqlite:sqlite_shell",
+        "//ui/keyboard:keyboard_unittests",
+        "//ui/message_center:message_center_unittests",
+        "//ui/snapshot:snapshot_unittests",
+        "//ui/views/examples:views_examples_with_content_exe",
+      ]
 
-    if (!is_debug && !is_component_build) {
-      deps += [ "//chrome/tools/service_discovery_sniffer" ]
+      if (!is_debug && !is_component_build) {
+        deps += [ "//chrome/tools/service_discovery_sniffer" ]
+      }
     }
 
     if (toolkit_views) {
@@ -522,59 +554,10 @@ group("both_gn_and_gyp") {
       "//third_party/apple_sample_code",
       "//third_party/molokocacao",
     ]
-
-    # TODO(GYP): Remove these when the targets below work and these
-    # are pulled in automatically.
-    deps += [
-      "//cc/blink",
-      "//components/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/webrtc/system_wrappers",
-      "//ui/app_list:app_list_unittests",
-      "//ui/gfx:gfx_unittests",
-      "//ui/native_theme",
-      "//ui/snapshot",
-      "//ui/surface",
-    ]
-
-    # TODO(dpranke): These are as-yet untriaged but need at least the above.
     deps -= [
-      "//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_browsertests",  # TODO(GYP)
-      "//components:components_unittests",  # TODO(GYP)
-      "//content/test:content_browsertests",  # TODO(GYP)
-      "//content/test:content_perftests",  # TODO(GYP)
-      "//device:device_unittests",  # TODO(GYP)
-      "//extensions:extensions_browsertests",  # TODO(GYP)
-      "//extensions:extensions_unittests",  # TODO(GYP)
-      "//mojo",  # TODO(GYP)
-      "//mojo/application/public/cpp",  # TODO(GYP)
-
-      # TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac.
-      "//third_party/WebKit/Source/platform:heap_unittests",
-      "//third_party/WebKit/Source/platform:platform_unittests",
-      "//third_party/WebKit/Source/web:webkit_unit_tests",
+      # Mojo in GN contains some things which are never compiled in GYP on Mac,
+      # so compilation fails on Mac. They need porting.
+      "//mojo",
     ]
   }
 
@@ -584,7 +567,8 @@ group("both_gn_and_gyp") {
       "//chrome/installer/setup:setup_unittests",
       "//chrome_elf:chrome_elf_unittests",
       "//chrome_elf:dll_hash_main",
-      "//components/crash/content/tools:crash_service",
+      "//cloud_print:cloud_print_unittests",
+      "//cloud_print/service/win:cloud_print_service",
       "//components/wifi:wifi_test",
       "//net:quic_client",
       "//net:quic_server",
@@ -603,11 +587,22 @@ group("both_gn_and_gyp") {
       "//net:net_unittests",  # TODO(GYP)
     ]
   } else if (!is_android && !is_ios) {
-    deps += [ "//breakpad:symupload" ]
+    deps += [ "//breakpad:symupload($host_toolchain)" ]
+  }
+  if (is_chromecast) {
+    deps += [ "//chromecast:cast_shell" ]
   }
 
-  if (!is_ios) {
-    deps += [ "//gpu/skia_runner:skia_runner" ]
+  if (is_mac) {  # TODO(GYP) || is_ios
+    deps += [ "//media/cast:cast_h264_vt_encoder_unittests" ]
+  }
+
+  if (use_openh264) {
+    deps += [
+      "//third_party/openh264:common",
+      "//third_party/openh264:encoder",
+      "//third_party/openh264:processing",
+    ]
   }
 }
 
@@ -617,23 +612,31 @@ group("gn_only") {
   deps = []
 
   if (!is_ios) {
+    deps += [ "//mojo/common:mojo_common_perftests" ]
+  }
+
+  if (!is_mac && !is_ios && !is_chromecast) {
     deps += [ "//mandoline:all" ]
   }
 
-  if (!is_android && !is_ios) {
+  if (!is_android && !is_ios && !is_chromeos) {
     deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
   }
 
-  if (is_linux && !is_chromeos) {
+  if (is_win || is_linux) {
+    deps += [
+      "//mash:all",
+      "//ui/views/mus:tests",
+    ]
+  }
+
+  if (is_linux && !is_chromeos && !is_chromecast) {
     # 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",
-      "//blimp:blimp_tests",
       "//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",
@@ -651,42 +654,42 @@ group("gn_only") {
       "//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_corruption_test",
+      "//third_party/leveldatabase:leveldb_crc32c_test",
+      "//third_party/leveldatabase:leveldb_db_bench",
+      "//third_party/leveldatabase:leveldb_db_test",
+      "//third_party/leveldatabase:leveldb_dbformat_test",
       "//third_party/leveldatabase:leveldb_env_test",
-      "//third_party/leveldatabase:leveldb_write_batch_test",
+      "//third_party/leveldatabase:leveldb_filename_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:fx_freetype",
+      "//third_party/leveldatabase:leveldb_table_test",
+      "//third_party/leveldatabase:leveldb_version_edit_test",
+      "//third_party/leveldatabase:leveldb_write_batch_test",
       "//third_party/libjpeg_turbo:simd",
+      "//third_party/libsrtp:rdbx_driver",
       "//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_aes_calc",
       "//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_kernel_driver",
       "//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_api",
       "//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/pdfium/third_party:fx_freetype",
       "//third_party/webrtc/system_wrappers:field_trial_default",
       "//third_party/webrtc/system_wrappers:metrics_default",
       "//ui/display/types",
@@ -695,9 +698,12 @@ group("gn_only") {
     ]
 
     if (target_cpu == "x86" || target_cpu == "x64") {
+      if (!is_android) {
+        deps += [ "//chrome/test:load_library_perf_tests" ]
+      }
       deps += [
-        "//third_party/libjpeg_turbo:simd_asm",
         "//native_client/src/trusted/platform_qualify:vcpuid",
+        "//third_party/libjpeg_turbo:simd_asm",
       ]
     }
     if (enable_nacl) {
@@ -706,9 +712,6 @@ group("gn_only") {
     if (use_ozone) {
       deps += [ "//ui/ozone/demo" ]
     }
-    if (is_android) {
-      deps += [ "//build/android/gyp/test:hello_world" ]
-    }
 
     if (is_linux && current_toolchain == host_toolchain) {
       deps += [ "//v8:d8" ]
@@ -716,11 +719,26 @@ group("gn_only") {
   }
 
   if (is_android) {
-    deps += [ "//blimp" ]
+    deps += [
+      "//build/android/gyp/test:hello_world",
+      "//build/android/incremental_install:bootstrap_java",
+    ]
   }
 
-  if (is_mac) {
-    deps -= [ "//mandoline:all" ]  # TODO(GYP)
+  if (!is_chromecast && (is_android || is_linux || is_chromeos)) {
+    deps += [
+      "//blimp",
+      "//blimp:blimp_tests",
+    ]
+  }
+
+  if (use_libfuzzer || use_drfuzz) {
+    # these are needed only for gn to discover build files.
+    deps += [
+      "//testing/libfuzzer:libfuzzer_main",
+      "//testing/libfuzzer/fuzzers:string_to_int_fuzzer",
+      "//testing/libfuzzer/tests:libfuzzer_tests",
+    ]
   }
 }
 
@@ -731,13 +749,12 @@ group("gn_mojo_targets") {
     # and figure out how cross-platform they are
     deps = [
       "//ipc/mojo:ipc_mojo_perftests",
-      "//media/mojo/services:cdm_service",
       "//media/mojo:tests",
+      "//media/mojo/services:cdm_service",
       "//mojo:tests",
+
       # TODO(use-new-edk):
-      #"//mojo/edk/js/test:js_integration_tests",
       #"//mojo/edk/js/tests:js_to_cpp_bindings_python",
-      "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
     ]
   }
 }
@@ -754,8 +771,8 @@ group("gn_visibility") {
 
   if (!is_ios) {
     deps += [
-      "//v8:v8_snapshot",
       "//v8:postmortem-metadata",
+      "//v8:v8_snapshot",
     ]
   }
 }
@@ -775,8 +792,12 @@ if (!is_ios) {
     # so we need to specify the dependencies here instead.
     if (is_android) {
       deps += [
+        "//breakpad:breakpad_unittests_deps",
         "//breakpad:dump_syms($host_toolchain)",
+        "//breakpad:microdump_stackwalk($host_toolchain)",
+        "//breakpad:minidump_dump($host_toolchain)",
         "//breakpad:minidump_stackwalk($host_toolchain)",
+        "//breakpad:symupload($host_toolchain)",
         "//content/shell/android:content_shell_apk",
         "//tools/imagediff($host_toolchain)",
       ]
@@ -790,7 +811,7 @@ if (!is_ios) {
     if (is_win) {
       deps += [
         "//components/test_runner:layout_test_helper",
-        "//content/shell:crash_service",
+        "//content/shell:content_shell_crash_service",
       ]
     }
 
@@ -815,162 +836,6 @@ if (!is_ios) {
 group("chromium_swarm_tests") {
 }
 
-if (is_linux) {
-  # This group corresponds to the list of tests run on the waterfall for
-  # desktop Linux GYP builds from testing/buildbot/chromium.linux.json. It's
-  # here to help track GYP -> GN conversion progress.
-  group("linux_default_tests") {
-    testonly = true
-    deps = [
-      "//base:base_unittests",  # PASSES (*) 2/25/2015
-      "//cc:cc_unittests",  # PASSES 2/25/2015
-      "//chrome/test:browser_tests",
-      "//chrome/test:interactive_ui_tests",
-      "//chrome/test:sync_integration_tests",  # Crashes for brettw in GN and GYP.
-      "//chrome/test:unit_tests",  # PASSES 2/25/2015
-      "//chrome/test/chromedriver:chromedriver_unittests",  # PASSES 2/25/2015
-      "//components:components_browsertests",  # PASSES 4/17/2015
-      "//components:components_unittests",  # PASSES 2/27/2015
-      "//content/test:content_browsertests",
-      "//content/test:content_unittests",  # PASSES 2/25/2015
-      "//crypto:crypto_unittests",  # PASSES 2/25/2015
-      "//dbus:dbus_unittests",  # PASSES 2/25/2015
-      "//device:device_unittests",  # PASSES 3/07/2015
-      "//extensions:extensions_browsertests",  # PASSES 2/25/2015
-      "//extensions:extensions_unittests",  # PASSES 2/25/2015
-      "//extensions/shell:app_shell_unittests",  # PASSES 2/25/2015
-      "//google_apis/gcm:gcm_unit_tests",  # PASSES 2/25/2015
-      "//google_apis:google_apis_unittests",  # PASSES 2/25/2015
-      "//gpu:gpu_unittests",  # PASSES 2/25/2015
-      "//ipc:ipc_tests",  # PASSES 2/25/2015
-      "//ipc/mojo:ipc_mojo_unittests",  # PASSES 2/25/2015
-      "//jingle:jingle_unittests",  # PASSES 2/25/2015
-      "//media:media_unittests",  # PASSES 3/3/2015
-      "//media/cast:cast_unittests",  # PASSES 2/25/2015
-      "//media/midi:midi_unittests",  # PASSES 4/10/2015
-      "//mojo/common:mojo_common_unittests",  # PASSES 2/25/2015
-      "//net:net_unittests",  # PASSES 2/25/2015
-      "//ppapi:ppapi_unittests",  # PASSES 2/26/2015
-      "//printing:printing_unittests",  # PASSES 2/25/2015
-      "//remoting:remoting_unittests",  # PASSES 4/17/2015
-      "//sandbox/linux:sandbox_linux_unittests",  # PASSES 2/25/2015
-      "//skia:skia_unittests",  # PASSES 2/25/2015
-      "//sql:sql_unittests",  # PASSES 2/25/2015
-      "//sync:sync_unit_tests",  # PASSES 2/25/2015
-      "//third_party/cacheinvalidation:cacheinvalidation_unittests",  # PASSES 2/25/2015
-
-      # TODO(use-new-edk):
-      #"//mojo/edk/system:mojo_system_unittests",  # PASSES 2/25/2015
-      #"//mojo/edk/test:mojo_public_bindings_unittests",  # PASSES 2/25/2015
-      #"//mojo/edk/test:mojo_public_environment_unittests",  # PASSES 2/25/2015
-      #"//mojo/edk/test:mojo_public_system_unittests",  # PASSES 2/25/2015
-      #"//mojo/edk/test:mojo_public_utility_unittests",
-      "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",  # PASSES 2/25/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",  # PASSES 2/25/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",  # PASSES 2/25/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",  # PASSES 2/25/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
-      "//ui/accessibility:accessibility_unittests",  # PASSES 2/25/2015
-      "//ui/app_list:app_list_unittests",  # PASSES 2/25/2015
-      "//ui/aura:aura_unittests",  # PASSES 2/25/2015
-      "//ui/base:ui_base_unittests",  # PASSES 4/17/2015
-      "//ui/compositor:compositor_unittests",  # PASSES 2/25/2015
-      "//ui/display:display_unittests",  # PASSES 2/25/2015
-      "//ui/events:events_unittests",  # PASSES 2/25/2015
-      "//ui/gfx:gfx_unittests",  # PASSES 2/25/2015
-      "//ui/gl:gl_unittests",
-      "//ui/touch_selection:ui_touch_selection_unittests",  # PASSES 2/25/2015
-      "//ui/views:views_unittests",  # PASSES (*) 2/25/2015
-      "//ui/wm:wm_unittests",  # PASSES 2/25/2015
-      "//url:url_unittests",  # PASSES 2/25/2015
-
-      # Note:
-      # (*) Fails but failures match GYP build at time of testing.
-    ]
-
-    if (enable_nacl) {
-      deps += [ "//components/nacl:nacl_loader_unittests" ]  # PASSES 3/28/2015
-    }
-  }
-} else if (is_win) {
-  group("windows_default_tests") {
-    testonly = true
-    deps = [
-      "//ash:ash_unittests",  # FAILS 4/20/2015
-      "//base:base_unittests",  # PASSES 4/20/2015
-      "//cc:cc_unittests",  # PASSES 4/17/2015
-      "//chrome_elf:chrome_elf_unittests",  # FAILS 4/20/2015
-      "//chrome/installer/util:installer_util_unittests",
-      "//chrome/installer/setup:setup_unittests",
-      "//chrome/test:browser_tests",
-      "//chrome/test:interactive_ui_tests",
-      "//chrome/test:sync_integration_tests",  # Note: need to turn off incremental linking for debug.
-      "//chrome/test:unit_tests",
-      "//chrome/test/chromedriver:chromedriver_unittests",  # PASSES 4/20/2015
-      "//components:components_browsertests",  # PASSES 4/24/2015
-      "//components:components_unittests",  # PASSES 4/17/2015
-      "//courgette:courgette_unittests",  # PASSES 4/20/2015
-      "//content/test:content_browsertests",
-      "//content/test:content_unittests",  # PASSES 4/17/2015
-      "//crypto:crypto_unittests",  # PASSES 4/17/2015
-      "//device:device_unittests",  # PASSES 4/17/2015
-      "//extensions:extensions_browsertests",  # PASSES 4/17/2015
-      "//extensions:extensions_unittests",  # PASSES 4/17/2015
-      "//extensions/shell:app_shell_unittests",  # Doesn't compile in 64-bit
-      "//google_apis/gcm:gcm_unit_tests",  # PASSES 4/17/2015
-      "//google_apis:google_apis_unittests",  # PASSES 4/17/2015
-      "//gpu:gpu_unittests",  # PASSES 4/17/2015
-      "//ipc:ipc_tests",  # PASSES 4/17/2015
-      "//ipc/mojo:ipc_mojo_unittests",  # PASSES 4/17/2015
-      "//jingle:jingle_unittests",  # PASSES 4/17/2015
-      "//media/cast:cast_unittests",  # PASSES 4/17/2015
-      "//media:media_unittests",  # PASSES 4/17/2015
-      "//mojo/common:mojo_common_unittests",  # PASSES 4/17/2015
-      "//net:net_unittests",  # PASSES 4/17/2015
-      "//ppapi:ppapi_unittests",  # PASSES 4/17/2015
-      "//printing:printing_unittests",  # PASSES 4/17/2015
-      "//remoting:remoting_unittests",  # PASSES 4/17/2015
-      "//sandbox/win:sbox_integration_tests",  # PASSES 4/20/2015
-      "//sandbox/win:sbox_unittests",  # PASSES 4/20/2015
-      "//sandbox/win:sbox_validation_tests",  # PASSES 4/20/2015
-      "//skia:skia_unittests",  # PASSES 4/17/2015
-      "//sql:sql_unittests",  # PASSES 4/17/2015
-      "//sync:sync_unit_tests",  # PASSES 4/20/2015
-      "//third_party/cacheinvalidation:cacheinvalidation_unittests",  # PASSES 4/20/2015
-
-      # TODO(use-new-edk):
-      #"//mojo/edk/system:mojo_system_unittests",  # Seems to hang?
-      #"//mojo/edk/test:mojo_public_bindings_unittests",  # FAILS
-      #"//mojo/edk/test:mojo_public_environment_unittests",  # PASSES 4/20/2015
-      #"//mojo/edk/test:mojo_public_system_unittests",  # PASSES 4/20/2015
-      #"//mojo/edk/test:mojo_public_utility_unittests",  # PASSES 4/20/2015
-      "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",  # Seems to hang?
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",  # FAILS
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",  # PASSES 4/20/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",  # PASSES 4/20/2015
-      "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",  # PASSES 4/20/2015
-      "//ui/accessibility:accessibility_unittests",  # PASSES 4/20/2015
-      "//ui/app_list:app_list_unittests",  # PASSES 4/20/2015
-      "//ui/aura:aura_unittests",  # PASSES 4/17/2015
-      "//ui/base:ui_base_unittests",  # PASSES 4/20/2015
-      "//ui/compositor:compositor_unittests",  # PASSES 4/20/2015
-      "//ui/display:display_unittests",  # PASSES 4/20/2015
-      "//ui/events:events_unittests",  # PASSES 4/20/2015
-      "//ui/gfx:gfx_unittests",  # PASSES (with assertion failure?) 4/20/2015
-      "//ui/gl:gl_unittests",
-      "//ui/message_center:message_center_unittests",  # PASSES 4/20/2015
-      "//ui/touch_selection:ui_touch_selection_unittests",  # PASSES 4/20/2015
-      "//ui/views:views_unittests",  # TooltipControllerTest failures
-      "//ui/wm:wm_unittests",  # PASSES 4/21/2015
-      "//url:url_unittests",  # PASSES 4/17/2015
-
-      # TODO(GYP) nacl_integration
-      # TODO(GYP) telemetry_perf_unittests
-      # TODO(GYP) telemetry_unittests
-    ]
-  }
-}
-
 group("chromium_builder_perf") {
   testonly = true
 
@@ -991,7 +856,12 @@ group("chromium_builder_perf") {
       deps += [ "//chrome/test:performance_browser_tests" ]
     }
     if (is_linux && !is_chromeos) {
-      deps += [ "//chrome:linux_symbols" ]
+      if (is_official_build) {
+        # In GN builds, this is controlled by the 'linux_dump_symbols'
+        # flag, which defaults to 1 for official builds. For now,
+        # we skip the separate flag and just key off of is_official_build.
+        deps += [ "//chrome:linux_symbols" ]
+      }
 
       if (!is_chromeos) {
         deps += [ "//tools/perf/clear_system_cache" ]
@@ -1000,14 +870,12 @@ group("chromium_builder_perf") {
 
     if (is_win) {
       deps += [
-        "//content/shell:crash_service",
+        "//chrome/tools/crash_service",
         # "//gpu:angle_perftests", TODO(GYP): crbug.com/537008
       ]
 
       if (target_cpu == "x86") {
-        deps += [
-          # "//content/shell:crash_service_win64", TODO(GYP): crbug.com/537009
-        ]
+        deps += [ "//chrome/tools/crash_service:crash_service_win64" ]
       }
     } else {
       deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]