[Android] Create buildable browser_tests gn target for android.

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index b62091b070f9590cd9fe5a3ed5e96239e2958114..10e759bfcccbaeaed811faf3c61cecd82c033593 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -859,111 +859,91 @@ if (!is_android) {
       ":browser_tests",
     ]
   }
+}
 
-  test("browser_tests") {
-    sources = [
-      "base/browser_tests_main.cc",
-    ]
-    sources +=
-        rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
-                    ".",
-                    "//chrome")
-    sources += rebase_path(
-            chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
-            ".",
-            "//chrome")
+test("browser_tests") {
+  sources = [
+    "base/browser_tests_main.cc",
+  ]
+  sources += rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
+                         ".",
+                         "//chrome")
 
-    configs += [
-      "//build/config:precompiled_headers",
-      "//third_party/WebKit/public:debug_devtools",
-    ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//third_party/WebKit/public:debug_devtools",
+  ]
 
-    data = [
-      "data/",
-      "//chrome/browser/policy/test/asn1der.py",
-      "//chrome/browser/policy/test/policy_testserver.py",
-      "//chrome/common/extensions/docs/examples/apps/calculator/",
-      "//chrome/third_party/mock4js/",
-      "//content/test/data/",
-      "//google_apis/test/",
-      "//media/test/data/",
-      "//net/tools/testserver/",
-      "//ppapi/tests/test_case.html",
-      "//ppapi/tests/test_case.html.mock-http-headers",
-      "//ppapi/tests/test_page.css",
-      "//ppapi/tests/test_page.css.mock-http-headers",
-      "//testing/test_env.py",
-      "//third_party/accessibility-audit/axs_testing.js",
-      "//third_party/chaijs/chai.js",
-      "//third_party/mocha/mocha.js",
-      "//third_party/pyftpdlib/",
-      "//third_party/pywebsocket/",
-      "//third_party/simplejson/",
-      "//third_party/tlslite/",
-      "//ui/webui/resources/js/",
-      "$root_out_dir/pyproto/",
-      "$root_out_dir/browser_tests.pak",
-      "$root_out_dir/chrome_100_percent.pak",
-      "$root_out_dir/chrome_200_percent.pak",
-      "$root_out_dir/remoting/unittests/",
-      "$root_out_dir/resources/extension/",
-      "$root_out_dir/test_case.html",
-      "$root_out_dir/test_case.html.mock-http-headers",
-      "$root_out_dir/test_data/",
-      "$root_out_dir/test_page.css",
-      "$root_out_dir/test_page.css.mock-http-headers",
-      "$root_out_dir/test_url_loader_data/",
+  deps = [
+    ":test_support",
+    "//base",
+    "//sync:test_support_sync_api",
+  ]
+
+  data_deps = []
+
+  data = []
+
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+  if (is_win) {
+    data += [ "$root_out_dir/chrome_200_percent.pak" ]
+  }
+  if (is_mac) {
+    data += [
+      "$root_out_dir/chrome_material_100_percent.pak",
+      "$root_out_dir/chrome_material_200_percent.pak",
     ]
-    if (is_win) {
-      data += [ "$root_out_dir/chrome_200_percent.pak" ]
-    }
-    if (is_mac) {
-      data += [
-        "$root_out_dir/chrome_material_100_percent.pak",
-        "$root_out_dir/chrome_material_200_percent.pak",
+  }
+  if (is_chromeos) {
+    data += [
+      # TODO(GYP): figure out which of these things are
+      # actually needed and also which should be pulled in via
+      # data or data_deps and through which dependencies.
+      "//chrome/browser/chromeos/login/test/https_forwarder.py",
+      "//chrome/browser/resources/chromeos/wallpaper_manager/",
+      "//chromeos/test/data/",
+      "//components/chrome_apps/webstore_widget/cws_widget/",
+      "//ui/file_manager/file_manager/",
+      "//ui/file_manager/gallery/",
+      "//ui/file_manager/image_loader/",
+      "//ui/file_manager/integration_tests/",
+      "//third_party/analytics/",
+      "//third_party/polymer/v1_0/components-chromium/polymer/",
+      "$root_out_dir/chromevox_test_data/",
+      "$root_out_dir/content_shell.pak",
+      "$root_out_dir/locales/",
+      "$root_out_dir/resources/chromeos/",
+    ]
+
+    data_deps += [ "//ui/keyboard:resources" ]
+
+    if (enable_nacl) {
+      data_deps += [
+        "//components/nacl/loader:nacl_helper",
+        "//ppapi/native_client:irt",
       ]
     }
-    if (is_chromeos) {
-      data += [
-        # TODO(GYP): figure out which of these things are
-        # actually needed and also which should be pulled in via
-        # data or data_deps and through which dependencies.
-        "//chrome/browser/chromeos/login/test/https_forwarder.py",
-        "//chrome/browser/resources/chromeos/wallpaper_manager/",
-        "//chromeos/test/data/",
-        "//components/chrome_apps/webstore_widget/cws_widget/",
-        "//ui/file_manager/file_manager/",
-        "//ui/file_manager/gallery/",
-        "//ui/file_manager/image_loader/",
-        "//ui/file_manager/integration_tests/",
-        "//third_party/analytics/",
-        "//third_party/polymer/v1_0/components-chromium/polymer/",
-        "$root_out_dir/chromevox_test_data/",
-        "$root_out_dir/content_shell.pak",
-        "$root_out_dir/locales/",
-        "$root_out_dir/resources/chromeos/",
-      ]
+  }
 
-      data_deps = [
-        "//ui/keyboard:resources",
-      ]
+  # TODO(jbudorick): In progress. See crbug.com/611756
+  if (is_android) {
+    deps += [
+      "//chrome/android:chrome_java",
+      "//v8:v8_external_startup_data_assets",
+    ]
 
-      if (enable_nacl) {
-        data_deps += [
-          "//components/nacl/loader:nacl_helper",
-          "//ppapi/native_client:irt",
-        ]
-      }
-    } else {
-      data_deps = []
-    }
+    enable_multidex = true
+  } else {
+    sources += rebase_path(
+            chrome_tests_gypi_values.chrome_browser_tests_desktop_only_sources,
+            ".",
+            "//chrome")
 
-    deps = [
+    deps += [
       ":browser_tests_js_webui",
       ":sync_integration_test_support",
-      ":test_support",
       ":test_support_ui",
-      "//base",
       "//base:i18n",
       "//base/test:test_support",
       "//chrome:browser_tests_pak",
@@ -973,7 +953,6 @@ if (!is_android) {
       "//chrome:strings",
       "//chrome/browser",
       "//chrome/browser/resources:extension_resource_demo",
-      "//chrome/common/extensions/api",
       "//chrome/renderer",
       "//components/autofill/content/browser:risk_proto",
       "//components/autofill/content/renderer:test_support",
@@ -993,7 +972,6 @@ if (!is_android) {
       "//device/bluetooth:mocks",
       "//device/serial:test_support",
       "//device/usb:test_support",
-      "//extensions/common/api",
       "//google_apis:test_support",
       "//media",
       "//media/base:test_support",
@@ -1003,7 +981,6 @@ if (!is_android) {
       "//sdch",
       "//skia",
       "//sync",
-      "//sync:test_support_sync_api",
       "//testing/gmock",
       "//testing/gtest",
       "//testing/perf",
@@ -1021,11 +998,6 @@ if (!is_android) {
       "//v8",
     ]
 
-    # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should
-    # be deleted and this line removed. See the chrome_extensions_browsertests
-    # target for more.
-    deps += [ "//extensions:chrome_extensions_browsertests" ]
-
     # Runtime dependencies
     data_deps += [
       "//chrome",
@@ -1037,16 +1009,180 @@ if (!is_android) {
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
+    data += [
+      "data/",
+      "//chrome/browser/policy/test/asn1der.py",
+      "//chrome/browser/policy/test/policy_testserver.py",
+      "//chrome/common/extensions/docs/examples/apps/calculator/",
+      "//chrome/third_party/mock4js/",
+      "//content/test/data/",
+      "//google_apis/test/",
+      "//media/test/data/",
+      "//net/tools/testserver/",
+      "//ppapi/tests/test_case.html",
+      "//ppapi/tests/test_case.html.mock-http-headers",
+      "//ppapi/tests/test_page.css",
+      "//ppapi/tests/test_page.css.mock-http-headers",
+      "//testing/test_env.py",
+      "//third_party/accessibility-audit/axs_testing.js",
+      "//third_party/chaijs/chai.js",
+      "//third_party/mocha/mocha.js",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/simplejson/",
+      "//third_party/tlslite/",
+      "//ui/webui/resources/js/",
+      "$root_out_dir/pyproto/",
+      "$root_out_dir/browser_tests.pak",
+      "$root_out_dir/chrome_100_percent.pak",
+      "$root_out_dir/chrome_200_percent.pak",
+      "$root_out_dir/remoting/unittests/",
+      "$root_out_dir/resources/extension/",
+      "$root_out_dir/test_case.html",
+      "$root_out_dir/test_case.html.mock-http-headers",
+      "$root_out_dir/test_data/",
+      "$root_out_dir/test_page.css",
+      "$root_out_dir/test_page.css.mock-http-headers",
+      "$root_out_dir/test_url_loader_data/",
+    ]
+
+    # TODO(jbudorick): The conditionals below are all platform-related and are
+    # trivially always true on android.
+
     if (!is_mac) {
       data += [ "$root_out_dir/locales/" ]
       data_deps += [ "//chrome:packed_extra_resources" ]
     }
+    if (!is_chromeos) {
+      sources -= [
+        "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
+        "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
+        "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
+        "../browser/extensions/api/terminal/terminal_private_apitest.cc",
+        "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
+        "../browser/net/nss_context_chromeos_browsertest.cc",
+        "data/webui/certificate_viewer_ui_test-inl.h",
+      ]
+      if (use_ash) {
+        sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ]
+        sources -= [
+          # On Windows and Linux, we currently don't support enough of the
+          # ash environment to run these unit tests.
+          #
+          # TODO: enable these on windows and linux.
+          "../browser/ui/ash/accelerator_commands_browsertest.cc",
+          "../browser/ui/ash/accelerator_controller_browsertest.cc",
+          "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc",
+          "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
+          "../browser/ui/ash/shelf_browsertest.cc",
+        ]
+        if (toolkit_views) {
+          sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc" ]
+        }
+      }
+      if (is_win || is_linux) {
+        sources +=
+            [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
+      }
+    }
+    if (!is_win) {
+      sources -= [
+        "../app/chrome_command_ids.h",
+        "../app/chrome_dll_resource.h",
+        "../app/chrome_version.rc.version",
+        "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc",
+      ]
+    }
+    if (is_android || is_ios || is_chromeos) {
+      sources -= [ "../browser/profiles/profile_statistics_browsertest.cc" ]
+    }
 
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+    # TODO(jbudorick): The conditionals below are configurable in gn but
+    # default to true on android.
+
+    if (enable_webrtc) {
+      deps += [ "//content/public/common:feature_h264_with_openh264_ffmpeg" ]
+    } else {
+      sources -= [
+        "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
+        "../browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc",
+        "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc",
+        "../browser/media/webrtc_apprtc_browsertest.cc",
+        "../browser/media/webrtc_audio_quality_browsertest.cc",
+        "../browser/media/webrtc_browsertest.cc",
+        "../browser/media/webrtc_disable_encryption_flag_browsertest.cc",
+        "../browser/media/webrtc_getmediadevices_browsertest.cc",
+        "../browser/media/webrtc_perf_browsertest.cc",
+        "../browser/media/webrtc_simulcast_browsertest.cc",
+        "../browser/media/webrtc_video_quality_browsertest.cc",
+        "../browser/media/webrtc_webcam_browsertest.cc",
+      ]
+    }
+    if (enable_media_router) {
+      sources += [ "../browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc" ]
+      deps += [ "//chrome/test/media_router:media_router_browsertests" ]
+    }
+    if (enable_supervised_users) {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sources,
+              ".",
+              "//chrome")
+    }
+    if (!enable_print_preview) {
+      sources -= [
+        "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc",
+        "../browser/printing/print_preview_dialog_controller_browsertest.cc",
+        "../browser/printing/print_preview_pdf_generated_browsertest.cc",
+        "../browser/service_process/service_process_control_browsertest.cc",
+        "../browser/ui/webui/print_preview/print_preview_ui_browsertest.cc",
+        "data/webui/print_preview.cc",
+        "data/webui/print_preview.h",
+      ]
+    }
+    if (!enable_print_preview || is_mac || is_chromeos) {
+      sources -= [
+        # This test depends on GetCommandLineForRelaunch, which is not
+        # available on Mac. It is also not intended to run on ChromeOS.
+        "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
+      ]
+    }
+    if (!enable_print_preview || is_chromeos) {
+      sources -= [
+        # Not intended to run on ChromeOS.
+        "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc",
+      ]
+    }
+    if (enable_remoting) {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
+              ".",
+              "//chrome")
+      deps += [ "//remoting/webapp" ]
+    }
+
+    # TODO(jbudorick): The conditionals below are configurable in gn but
+    # default to false on android.
 
+    if (enable_extensions) {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
+              ".",
+              "//chrome")
+
+      deps += [
+        "//chrome/common/extensions/api",
+
+        # TODO(rockot) bug 505926: The chrome_extensions_browsertests target
+        # should be deleted and this line removed. See the
+        # chrome_extensions_browsertests target for more.
+        "//extensions:chrome_extensions_browsertests",
+        "//extensions/common/api",
+      ]
+    }
     if (!enable_one_click_signin) {
       sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc" ]
     }
+
     if (enable_nacl) {
       sources += [
         "../browser/extensions/extension_nacl_browsertest.cc",
@@ -1096,6 +1232,7 @@ if (!is_android) {
         ]
       }
     }
+
     if (use_ash) {
       sources +=
           rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
@@ -1107,9 +1244,11 @@ if (!is_android) {
         deps += [ ":test_support_applist_ash" ]
       }
     }
+
     if (use_aura || toolkit_views) {
       deps += [ "//ui/events:test_support" ]
     }
+
     if (toolkit_views) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_views_sources,
@@ -1128,66 +1267,11 @@ if (!is_android) {
                   "//chrome")
         }
       }
+      if (!is_chromeos) {
+        sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
+      }
     }
 
-    if (is_linux && !is_component_build) {

[sky, 2016/07/06 16:00:51]

Can you try to try to keep the same order so this is easier to read (and history
is better preserved)?

[jbudorick, 2016/07/07 14:58:32]

Done.

-      # Set rpath to find the CDM adapter even in a non-component build.
-      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-    }
-
-    if (is_chromeos) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources,
-              ".",
-              "//chrome")
-      sources -= [
-        "../../apps/load_and_launch_browsertest.cc",
-        "../browser/policy/policy_startup_browsertest.cc",
-
-        # chromeos does not support profile list avatar menu
-        "../browser/profiles/profile_list_desktop_browsertest.cc",
-        "../browser/service_process/service_process_control_browsertest.cc",
-
-        # chromeos does not use cross-platform panels
-        "../browser/ui/panels/panel_extension_browsertest.cc",
-
-        # inline login UI is disabled on chromeos
-        "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
-
-        # chromeos does not use the desktop user manager
-        "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
-      ]
-      deps += [
-        "//chromeos/ime:gencode",
-        "//components/arc:arc_test_support",
-        "//components/user_manager:test_support",
-        "//ui/login:resources",
-      ]
-
-      if (use_dbus) {
-        deps += [ "//dbus:test_support" ]
-      }
-    } else {
-      sources -= [
-        "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
-        "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
-        "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
-        "../browser/extensions/api/terminal/terminal_private_apitest.cc",
-        "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
-        "../browser/net/nss_context_chromeos_browsertest.cc",
-        "data/webui/certificate_viewer_ui_test-inl.h",
-      ]
-      if (use_ash) {
-        sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ]
-      }
-      if (toolkit_views) {
-        sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
-      }
-      if (is_win || is_linux) {
-        sources +=
-            [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
-      }
-    }
     if (enable_web_speech) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_speech_sources,
@@ -1203,179 +1287,6 @@ if (!is_android) {
     if (enable_captive_portal_detection) {
       sources += [ "../browser/captive_portal/captive_portal_browsertest.cc" ]
     }
-    if (enable_webrtc) {
-      deps += [ "//content/public/common:feature_h264_with_openh264_ffmpeg" ]
-    } else {
-      sources -= [
-        "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
-        "../browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc",
-        "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc",
-        "../browser/media/webrtc_apprtc_browsertest.cc",
-        "../browser/media/webrtc_audio_quality_browsertest.cc",
-        "../browser/media/webrtc_browsertest.cc",
-        "../browser/media/webrtc_disable_encryption_flag_browsertest.cc",
-        "../browser/media/webrtc_getmediadevices_browsertest.cc",
-        "../browser/media/webrtc_perf_browsertest.cc",
-        "../browser/media/webrtc_simulcast_browsertest.cc",
-        "../browser/media/webrtc_video_quality_browsertest.cc",
-        "../browser/media/webrtc_webcam_browsertest.cc",
-      ]
-    }
-    if (enable_media_router) {
-      sources += [ "../browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc" ]
-      deps += [ "//chrome/test/media_router:media_router_browsertests" ]
-    }
-    if (is_win) {
-      deps += [
-        "//chrome:other_version",
-        "//third_party/wtl",
-        "//ui/resources",
-      ]
-    } else {
-      sources -= [
-        "../app/chrome_command_ids.h",
-        "../app/chrome_dll_resource.h",
-        "../app/chrome_version.rc.version",
-        "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc",
-      ]
-    }
-    if (!is_chromeos && use_ash) {
-      sources -= [
-        # On Windows and Linux, we currently don't support enough of the
-        # ash environment to run these unit tests.
-        #
-        # TODO: enable these on windows and linux.
-        "../browser/ui/ash/accelerator_commands_browsertest.cc",
-        "../browser/ui/ash/accelerator_controller_browsertest.cc",
-        "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc",
-        "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
-        "../browser/ui/ash/shelf_browsertest.cc",
-      ]
-
-      if (toolkit_views) {
-        sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc" ]
-      }
-    }
-    if (is_mac) {
-      # TODO(mark): We really want this for all non-static library
-      # targets, but when we tried to pull it up to the common.gypi
-      # level, it broke other things like the ui and startup tests. *shrug*
-      ldflags = [ "-Wl,-ObjC" ]
-
-      # Other platforms only need
-      # chrome_resources.gyp:{packed_extra_resources,packed_resources},
-      # and can build this target standalone much faster.
-      deps += [
-        "//chrome",
-        "//chrome/common:app_mode_app_support",
-
-        # TODO(GYP) Mac: GYP has this dependency. Uncommenting this line
-        # generates duplicate symbols between
-        #   obj/components/crash/content/app/breakpad_stubs/crash_reporter_client.o
-        #   obj/components/crash/content/app/lib/crash_reporter_client.o
-        # It's not clear how this is supposed to work. The intent seems to be
-        # to not link breakpad in the tests. The dependency on .../app:lib
-        # seems to come from //chrome/app:test_support. That reference maybe
-        # should be a dependency on the stubs instead because it could be all
-        # tests might want them. Or it could be that we need to make a new
-        # "headers" target to make GN check happy, and then force each
-        # executable to link the correct implementation. Somebody with a
-        # higher-level understanding of Mac crash reporting needs to think
-        # about this.
-        # "//components/crash/content/app:breakpad_stubs",
-        "//third_party/ocmock",
-      ]
-      sources +=
-          rebase_path(chrome_tests_gypi_values.chrome_browser_tests_mac_sources,
-                      ".",
-                      "//chrome")
-      sources -= [
-        # TODO(groby): This test depends on hunspell and we cannot run it on
-        # Mac, which does not use hunspell by default.
-        "../browser/spellchecker/spellcheck_service_browsertest.cc",
-
-        # ProcessSingletonMac doesn"t do anything.
-        "../browser/process_singleton_browsertest.cc",
-      ]
-
-      if (safe_browsing_mode == 1) {
-        sources -= [
-          # single-process mode hangs on Mac sometimes because of multiple UI
-          # message loops. See 306348
-          "../renderer/safe_browsing/phishing_classifier_browsertest.cc",
-          "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
-        ]
-      }
-
-      data_deps += [
-        "//chrome",
-        "//chrome:chrome_framework",
-      ]
-
-      # TODO(rsesek): Remove once https://crbug.com/611414 is fixed.
-      data += [
-        "$root_out_dir/Chromium.app/",
-        "$root_out_dir/Chromium Framework.framework/",
-        "$root_out_dir/power_saver_test_plugin.plugin/",
-        "$root_out_dir/ppapi_tests.plugin/",
-      ]
-
-      # The browser window can be views or Cocoa on Mac. Test accordingly.
-      if (mac_views_browser) {
-        sources += rebase_path(
-                chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sources,
-                ".",
-                "//chrome")
-      } else {
-        sources += rebase_path(
-                chrome_tests_gypi_values.chrome_browser_tests_cocoa_sources,
-                ".",
-                "//chrome")
-      }
-    }
-    if (is_mac || is_win) {
-      sources += [
-        "../browser/extensions/api/networking_private/networking_private_apitest.cc",
-        "../browser/extensions/api/networking_private/networking_private_service_client_apitest.cc",
-        "../browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc",
-        "../browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc",
-      ]
-      deps += [ "//components/wifi:test_support" ]
-    }
-    if (is_linux || is_win) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_non_mac_desktop_sources,
-              ".",
-              "//chrome")
-    }
-    if (!is_posix || is_chromeos) {
-      sources -= [ "../common/time_format_browsertest.cc" ]
-    }
-    if (is_android) {
-      sources -= [
-        "../browser/policy/cloud/component_cloud_policy_browsertest.cc",
-        "../browser/prefs/pref_hash_browsertest.cc",
-        "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
-        "../renderer/spellchecker/spellcheck_unittest.cc",
-      ]
-    }
-    if (is_chromeos) {
-      sources += [
-        "../browser/extensions/api/networking_private/networking_private_apitest.cc",
-        "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
-      ]
-    }
-    if (is_android || is_ios || is_chromeos) {
-      sources -= [ "../browser/profiles/profile_statistics_browsertest.cc" ]
-    }
-    if (!is_android && !is_ios) {
-      sources +=
-          [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
-      deps += [
-        "//components/copresence",
-        "//third_party/libaddressinput",
-      ]
-    }
     if (enable_app_list) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
@@ -1394,12 +1305,6 @@ if (!is_android) {
               ".",
               "//chrome")
     }
-    if (enable_supervised_users) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sources,
-              ".",
-              "//chrome")
-    }
     if (enable_pepper_cdms) {
       # Runtime dependencies.
       data_deps += [
@@ -1407,30 +1312,6 @@ if (!is_android) {
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
     }
-    if (!enable_print_preview) {
-      sources -= [
-        "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc",
-        "../browser/printing/print_preview_dialog_controller_browsertest.cc",
-        "../browser/printing/print_preview_pdf_generated_browsertest.cc",
-        "../browser/service_process/service_process_control_browsertest.cc",
-        "../browser/ui/webui/print_preview/print_preview_ui_browsertest.cc",
-        "data/webui/print_preview.cc",
-        "data/webui/print_preview.h",
-      ]
-    }
-    if (!enable_print_preview || is_mac || is_chromeos) {
-      sources -= [
-        # This test depends on GetCommandLineForRelaunch, which is not
-        # available on Mac. It is also not intended to run on ChromeOS.
-        "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
-      ]
-    }
-    if (!enable_print_preview || is_chromeos) {
-      sources -= [
-        # Not intended to run on ChromeOS.
-        "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc",
-      ]
-    }
     if (enable_mdns) {
       sources += [
         "../browser/extensions/api/gcd_private/gcd_private_apitest.cc",
@@ -1450,19 +1331,9 @@ if (!is_android) {
         "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
       ]
     }
-    if (is_android || is_ios) {
-    }
-    if (enable_remoting) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
-              ".",
-              "//chrome")
-      deps += [ "//remoting/webapp" ]
-    }
     if (use_x11) {
       deps += [ "//tools/xdisplaycheck" ]
     }
-
     if (use_aura) {
       sources += [
         "base/mash_browser_tests_main.cc",
@@ -1492,6 +1363,165 @@ if (!is_android) {
     }
   }
 
+  if (is_linux && !is_component_build) {
+    # Set rpath to find the CDM adapter even in a non-component build.
+    configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+  }
+
+  if (is_chromeos) {
+    sources += rebase_path(
+            chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources,
+            ".",
+            "//chrome")
+    sources -= [
+      "../../apps/load_and_launch_browsertest.cc",
+      "../browser/policy/policy_startup_browsertest.cc",
+
+      # chromeos does not support profile list avatar menu
+      "../browser/profiles/profile_list_desktop_browsertest.cc",
+      "../browser/service_process/service_process_control_browsertest.cc",
+
+      # chromeos does not use cross-platform panels
+      "../browser/ui/panels/panel_extension_browsertest.cc",
+
+      # inline login UI is disabled on chromeos
+      "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
+
+      # chromeos does not use the desktop user manager
+      "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
+    ]
+    deps += [
+      "//chromeos/ime:gencode",
+      "//components/arc:arc_test_support",
+      "//components/user_manager:test_support",
+      "//ui/login:resources",
+    ]
+
+    if (use_dbus) {
+      deps += [ "//dbus:test_support" ]
+    }
+  }
+
+  if (is_win) {
+    deps += [
+      "//chrome:other_version",
+      "//third_party/wtl",
+      "//ui/resources",
+    ]
+  }
+
+  if (is_mac) {
+    # TODO(mark): We really want this for all non-static library
+    # targets, but when we tried to pull it up to the common.gypi
+    # level, it broke other things like the ui and startup tests. *shrug*
+    ldflags = [ "-Wl,-ObjC" ]
+
+    # Other platforms only need
+    # chrome_resources.gyp:{packed_extra_resources,packed_resources},
+    # and can build this target standalone much faster.
+    deps += [
+      "//chrome",
+      "//chrome/common:app_mode_app_support",
+
+      # TODO(GYP) Mac: GYP has this dependency. Uncommenting this line
+      # generates duplicate symbols between
+      #   obj/components/crash/content/app/breakpad_stubs/crash_reporter_client.o
+      #   obj/components/crash/content/app/lib/crash_reporter_client.o
+      # It's not clear how this is supposed to work. The intent seems to be
+      # to not link breakpad in the tests. The dependency on .../app:lib
+      # seems to come from //chrome/app:test_support. That reference maybe
+      # should be a dependency on the stubs instead because it could be all
+      # tests might want them. Or it could be that we need to make a new
+      # "headers" target to make GN check happy, and then force each
+      # executable to link the correct implementation. Somebody with a
+      # higher-level understanding of Mac crash reporting needs to think
+      # about this.
+      # "//components/crash/content/app:breakpad_stubs",
+      "//third_party/ocmock",
+    ]
+    sources +=
+        rebase_path(chrome_tests_gypi_values.chrome_browser_tests_mac_sources,
+                    ".",
+                    "//chrome")
+    sources -= [
+      # TODO(groby): This test depends on hunspell and we cannot run it on
+      # Mac, which does not use hunspell by default.
+      "../browser/spellchecker/spellcheck_service_browsertest.cc",
+
+      # ProcessSingletonMac doesn"t do anything.
+      "../browser/process_singleton_browsertest.cc",
+    ]
+
+    if (safe_browsing_mode == 1) {
+      sources -= [
+        # single-process mode hangs on Mac sometimes because of multiple UI
+        # message loops. See 306348
+        "../renderer/safe_browsing/phishing_classifier_browsertest.cc",
+        "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
+      ]
+    }
+
+    data_deps += [
+      "//chrome",
+      "//chrome:chrome_framework",
+    ]
+
+    # TODO(rsesek): Remove once https://crbug.com/611414 is fixed.
+    data += [
+      "$root_out_dir/Chromium.app/",
+      "$root_out_dir/Chromium Framework.framework/",
+      "$root_out_dir/power_saver_test_plugin.plugin/",
+      "$root_out_dir/ppapi_tests.plugin/",
+    ]
+
+    # The browser window can be views or Cocoa on Mac. Test accordingly.
+    if (mac_views_browser) {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sources,
+              ".",
+              "//chrome")
+    } else {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_tests_cocoa_sources,
+              ".",
+              "//chrome")
+    }
+  }
+  if (is_mac || is_win) {
+    sources += [
+      "../browser/extensions/api/networking_private/networking_private_apitest.cc",
+      "../browser/extensions/api/networking_private/networking_private_service_client_apitest.cc",
+      "../browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc",
+      "../browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc",
+    ]
+    deps += [ "//components/wifi:test_support" ]
+  }
+  if (is_linux || is_win) {
+    sources += rebase_path(
+            chrome_tests_gypi_values.chrome_browser_tests_non_mac_desktop_sources,
+            ".",
+            "//chrome")
+  }
+  if (!is_posix || is_chromeos) {
+    sources -= [ "../common/time_format_browsertest.cc" ]
+  }
+  if (is_chromeos) {
+    sources += [
+      "../browser/extensions/api/networking_private/networking_private_apitest.cc",
+      "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
+    ]
+  }
+  if (!is_android && !is_ios) {
+    sources +=
+        [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
+    deps += [
+      "//components/copresence",
+      "//third_party/libaddressinput",
+    ]
+  }
+}
+
+if (!is_android) {
   test("sync_integration_tests") {
     sources =
         rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources,