Revert of Add chrome driver to the GN build.

chrome/test/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 
@@ skipping 198 matching lines @@
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
 
 if (!is_android && (!is_win || link_chrome_on_windows)) {
-  import("//chrome/chrome_tests.gni")
+  gypi_values = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("../chrome_tests.gypi") ],
+                            "scope",
+                            [ "../chrome_tests.gypi" ])
 
   test("interactive_ui_tests") {
-    sources =
-        rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources,
-                    ".",
-                    "//chrome")
+    sources = rebase_path(gypi_values.chrome_interactive_ui_test_sources,
+                          ".",
+                          "//chrome")
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     ldflags = []
 
     deps = [
       "//base/allocator",
       "//chrome/browser",
       "//chrome/browser/devtools",
       "//chrome/renderer",
       "//chrome/test:test_support",
@@ skipping 22 matching lines @@
       "//ui/base:test_support",
       "//ui/web_dialogs:test_support",
     ]
 
     # Runtime dependencies
     datadeps = [
       "//third_party/mesa:osmesa",
     ]
 
     if (toolkit_views) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_views_sources,
-              ".",
-              "//chrome")
+      sources +=
+          rebase_path(gypi_values.chrome_interactive_ui_test_views_sources,
+                      ".",
+                      "//chrome")
       deps += [
         "//ui/views",
         "//ui/views:test_support",
         "//ui/views/controls/webview:test_support",
       ]
       if (!is_mac) {
         sources += rebase_path(
-                chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
+                gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
                 ".",
                 "//chrome")
       }
       if (is_linux) {
         # TODO(gbillock): aura linux does not support the automation for
         # SendMouseMoveNotifyWhenDone
         sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
       }
       if (is_chromeos || !use_x11) {
         sources -= [
           "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc",
           "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc",
         ]
       }
     }
 
     if (is_linux && !is_chromeos) {
       # Desktop linux.
       sources -= [
         # TODO(port): This times out. Attempts have been made to fix the
         # individual failures, but each time I disable a test from these
         # suites, it seems like one or another starts timing out too.
         "../browser/ui/views/keyboard_access_browsertest.cc",
       ]
     } else {
       # Everything but desktop Linux.
       sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources,
+              gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources,
               ".",
               "//chrome")
     }
 
     if (is_chromeos) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sources,
-              ".",
-              "//chrome")
+      sources +=
+          rebase_path(gypi_values.chrome_interactive_ui_test_chromeos_sources,
+                      ".",
+                      "//chrome")
       sources += [ "../browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc" ]
       sources -= [
         # Use only the _chromeos version on ChromeOS.
         "base/view_event_test_platform_part_ash.cc",
       ]
 
       deps += [
         "//ash/resources",
         "//chromeos",
       ]
 
       if (enable_nacl) {
         deps += [
           "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
           "//components/nacl:nacl_helper",
 
           # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',  TODO(GYP)
         ]
       }
 
       if (is_chrome_branded) {
         sources -= [
           # These tests are failing on official cros bots. crbug.com/431450.
           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
         ]
       }
     } else {
       # ChromeOS doesn't use panels, everybody else does.
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_panels_sources,
-              ".",
-              "//chrome")
+      sources +=
+          rebase_path(gypi_values.chrome_interactive_ui_test_panels_sources,
+                      ".",
+                      "//chrome")
 
       # TODO(tapted): Include on mac when views panels are ported.
       if (toolkit_views && !is_mac) {
         sources += rebase_path(
-                chrome_tests_gypi_values.chrome_interactive_ui_test_panels_views_sources,
+                gypi_values.chrome_interactive_ui_test_panels_views_sources,
                 ".",
                 "//chrome")
       }
     }
 
     if (!is_linux) {
       # Non-Linux platforms (Linux includes ChromeOS here).
       sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
+              gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
               ".",
               "//chrome")
     }
 
     if (is_win) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources,
+                             ".",
+                             "//chrome")
       sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/isimpledom",
         "//third_party/wtl",
         "//ui/resources",
       ]
     }
 
     if (is_mac) {
@@ skipping 10 matching lines @@
       # application embedder is using.
       deps += [ "//third_party/cld_2:cld2_platform_impl" ]
     }
 
     if (use_x11) {
       configs += [ "//build/config/linux:xtst" ]
       datadeps += [ "//tools/xdisplaycheck" ]
     }
 
     if (enable_app_list) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_app_list_sources,
-              ".",
-              "//chrome")
+      sources +=
+          rebase_path(gypi_values.chrome_interactive_ui_test_app_list_sources,
+                      ".",
+                      "//chrome")
     }
 
     if (use_ash) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_interactive_ui_test_ash_sources,
+                             ".",
+                             "//chrome")
       deps += [ "//ash:test_support" ]
     }
 
     if (enable_notifications) {
       sources += rebase_path(
-              chrome_tests_gypi_values.chrome_interactive_ui_test_notifications_sources,
+              gypi_values.chrome_interactive_ui_test_notifications_sources,
               ".",
               "//chrome")
 
       # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform
       # panels).
       if (!is_chromeos) {
         sources += [
           "../browser/notifications/notification_browsertest.cc",
           "../browser/notifications/platform_notification_service_browsertest.cc",
         ]
@@ skipping 12 matching lines @@
     }  # enable_notifications
 
     if (use_aura || is_chromeos) {
       sources -=
           [ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ]
     }
   }
 
   source_set("sync_integration_test_support") {
     testonly = true
-    sources = rebase_path(
-            chrome_tests_gypi_values.test_support_sync_integration_sources,
-            ".",
-            "//chrome")
+    sources = rebase_path(gypi_values.test_support_sync_integration_sources,
+                          ".",
+                          "//chrome")
     public_deps = [
       "//chrome/browser",
     ]
     deps = [
       ":test_support",
       "//base",
       "//chrome",
       "//components/invalidation",
       "//components/invalidation:test_support",
       "//net",
@@ skipping 96 matching lines @@
           "//testing/gtest",
           "//url",
         ]
         if (defined(invoker.deps)) {
           deps += invoker.deps
         }
       }
     }
 
     js2webui("browser_tests_js_webui") {
-      sources = rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_webui_js_sources,
-              ".",
-              "//chrome")
+      sources = rebase_path(gypi_values.chrome_browser_tests_webui_js_sources,
+                            ".",
+                            "//chrome")
       if (is_chrome_branded) {
         # crbug.com/230471
         sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
       }
       if (!is_chromeos) {
         sources -= [
           "data/webui/certificate_viewer_dialog_test.js",
           "test/data/chromeos/oobe_webui_browsertest.js",
         ]
       }
       if (!enable_app_list) {
         sources -= [ "../browser/ui/webui/app_list/start_page_browsertest.js" ]
       }
       if (!enable_supervised_users) {
         sources -=
             [ "../browser/ui/webui/downloads_ui_supervised_browsertest.js" ]
       }
       deps = [
         "//skia",
       ]
     }
   }
 
   test("browser_tests") {
     sources = [
       "base/browser_tests_main.cc",
     ]
     sources +=
-        rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
+        rebase_path(gypi_values.chrome_browser_tests_sources, ".", "//chrome")
+    sources +=
+        rebase_path(gypi_values.chrome_browser_extensions_test_support_sources,
                     ".",
                     "//chrome")
-    sources += rebase_path(
-            chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
-            ".",
-            "//chrome")
 
     deps = [
       ":sync_integration_test_support",
       ":test_support",
       "//base",
       "//base:i18n",
       "//base/allocator",
       "//base/test:test_support",
       "//chrome:browser_tests_pak",
       "//chrome:packed_extra_resources",
@@ skipping 134 matching lines @@
     if (debug_devtools) {
       defines += [ "DEBUG_DEVTOOLS=1" ]
     }
     if (use_ash) {
       deps += [ "//ash:test_support" ]
     }
     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,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_views_sources,
+                             ".",
+                             "//chrome")
       deps += [ "//ui/views" ]
       if (!is_mac) {
-        sources += rebase_path(
-                chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sources,
-                ".",
-                "//chrome")
+        sources +=
+            rebase_path(gypi_values.chrome_browser_tests_views_non_mac_sources,
+                        ".",
+                        "//chrome")
       }
     }
     if (is_chromeos) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_chromeos_sources,
+                             ".",
+                             "//chrome")
       sources -= [
         "../../apps/load_and_launch_browsertest.cc",
         "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
         "../browser/printing/cloud_print/test/cloud_print_proxy_process_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
@@ skipping 16 matching lines @@
         "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
         "../browser/net/nss_context_chromeos_browsertest.cc",
         "../browser/ui/ash/keyboard_controller_browsertest.cc",
         "data/webui/certificate_viewer_ui_test-inl.h",
       ]
       if (toolkit_views) {
         sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
       }
     }
     if (enable_configuration_policy) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_policy_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_policy_sources,
+                             ".",
+                             "//chrome")
     }
     if (enable_web_speech) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_speech_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_speech_sources,
+                             ".",
+                             "//chrome")
     }
     if (safe_browsing_mode == 1) {
       sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_full_safe_browsing_sources,
+              gypi_values.chrome_browser_tests_full_safe_browsing_sources,
               ".",
               "//chrome")
       defines += [ "FULL_SAFE_BROWSING" ]
     }
     if (enable_captive_portal_detection) {
       sources += [ "../browser/captive_portal/captive_portal_browsertest.cc" ]
     }
     if (!enable_webrtc) {
       sources -= [
         "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
@@ skipping 110 matching lines @@
           [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
       deps += [ "//components/copresence" ]
     }
     if (!is_android && !is_ios && !is_linux) {
       # NPAPI test plugin only works on some platforms.
       data_deps += [
         #'../content/content_shell_and_tests.gyp:copy_npapi_test_plugin',  TODO(GYP)
       ]
     }
     if (enable_app_list) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_app_list_sources,
+                             ".",
+                             "//chrome")
     }
     if (enable_supervised_users) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sources,
-              ".",
-              "//chrome")
+      sources +=
+          rebase_path(gypi_values.chrome_browser_tests_supervised_user_sources,
+                      ".",
+                      "//chrome")
     }
     if (enable_pepper_cdms) {
       # Runtime dependencies.
       data_deps += [
         "//media/cdm/ppapi:clearkeycdmadapter",
         "//third_party/widevine/cdm:adapter",
       ]
     }
     if (!enable_print_preview) {
       sources -= [
@@ skipping 30 matching lines @@
       deps -= [ "//third_party/libaddressinput" ]
     }
     if (use_ozone) {
       sources -= [
         # crbug.com/362698
         "../browser/chromeos/input_method/input_method_engine_browsertests.cc",
         "../browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc",
       ]
     }
     if (enable_remoting) {
-      sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
-              ".",
-              "//chrome")
+      sources += rebase_path(gypi_values.chrome_browser_tests_remoting_sources,
+                             ".",
+                             "//chrome")
       #deps += [ "//remoting:remoting_webapp" ]  TODO(GYP)
     }
     if (use_x11) {
       deps += [ "//tools/xdisplaycheck" ]
     }
   }
 
   test("sync_integration_tests") {
     sources =
-        rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources,
-                    ".",
-                    "//chrome")
+        rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome")
 
     # TODO(phajdan.jr): Only temporary, to make transition easier.
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     deps = [
       ":sync_integration_test_support",
       ":test_support",
       "//base/allocator",
       "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
@@ skipping 57 matching lines @@
         "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
       ]
     }
     if (!enable_supervised_users) {
       sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ]
     }
   }
 
   test("sync_performance_tests") {
     sources =
-        rebase_path(chrome_tests_gypi_values.sync_performance_tests_sources,
-                    ".",
-                    "//chrome")
+        rebase_path(gypi_values.sync_performance_tests_sources, ".", "//chrome")
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     deps = [
       ":sync_integration_test_support",
       "//base/allocator",
       "//crypto:platform",
       "//sync",
       "//testing/gmock",
       "//testing/gtest",
@@ skipping 553 matching lines @@
     }
     if (use_ozone) {
       # crbug.com/354036
       sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
     }
     if (!enable_plugin_installation) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
 }