roll up of misc. gn work

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c26670927af52fb9d82071a15a4a5556cc7ce16a..1a9a1ec1ab8fb880cf3ef0e7b91310627467adbe 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
+import("//components/nacl/nacl_defines.gni")
 import("//testing/test.gni")
 
 # This target exists to reference other test executables to bring these files
@@ -330,10 +331,10 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
       ]
 
       if (enable_nacl) {
-        # TODO(GYP) this is also under a disable_nacl_untrusted==0 condition.
         deps += [
-          # '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',  TODO(GYP)
-          # '../components/nacl.gyp:nacl_helper',  TODO(GYP)
+          "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
+          "//components/nacl:nacl_helper",
+
           # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',  TODO(GYP)
         ]
       }
@@ -579,7 +580,10 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
         sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
       }
       if (!is_chromeos) {
-        sources -= [ "data/webui/certificate_viewer_dialog_test.js" ]
+        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" ]
@@ -674,7 +678,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + nacl_defines
 
     # TODO(GYP) if (is_win) {
     #       ['incremental_chrome_dll==1', {
@@ -705,28 +709,26 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
           "nacl/pnacl_header_test.cc",
           "nacl/pnacl_header_test.h",
         ]
-        deps += [
-          #'test/data/nacl/nacl_test_data.gyp:*',  # TODO(GYP)
-          #'../ppapi/native_client/native_client.gyp:nacl_irt',  # TODO(GYP)
-          #'../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app',  # TODO(GYP)          #'../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo',  # TODO(GYP)
-          #'../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo',  # TODO(GYP)
+        data_deps += [
+          # "test/data/nacl:shared_test_files",
+          "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt_x64)",
+          # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app",  # TODO(GYP)
+          # "../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo",  # TODO(GYP)
         ]
         if (is_chromeos) {
           sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
+          deps += [
+            #'browser_chromeos',  TODO(GYP)
+            #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data',  TODO(GYP)
+          ]
         }
-        deps += [
-          #'browser_chromeos',  TODO(GYP)
-          #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data',  TODO(GYP)
-        ]
       }
       if (is_win || is_linux) {
         sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
-        deps += [
-          #'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',  TODO(GYP)
-        ]
+        deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
       }
       if (is_win) {
         # TODO(halyavin) NaCl on Windows can't open debug stub socket in
@@ -736,16 +738,14 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
           #'chrome.gyp:chrome_nacl_win64',  TODO(GYP)
         ]
       }
-      is(is_linux) {
+      if (is_linux) {
         deps += [
-          #'../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap', TODO(GYP)
-          #'../components/nacl.gyp:nacl_helper', TODO(GYP)
-          #'../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP)
+          "//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_chromeos) {
-        sources -= [ "test/data/chromeos/oobe_webui_browsertest.js" ]
-      }
     }
     if (debug_devtools) {
       defines += [ "DEBUG_DEVTOOLS=1" ]
@@ -1293,11 +1293,11 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
         sources -= [ "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc" ]
       }
     }
-    if (enable_nacl) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_nacl_sources,
-                             ".",
-                             "//chrome")
-    }
+    #if (enable_nacl) {
+    #  sources += rebase_path(unit_gypi_values.chrome_unit_tests_nacl_sources,
+    #                         ".",
+    #                         "//chrome")
+    #}
     if (enable_extensions) {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_extensions_sources,
@@ -1676,4 +1676,68 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
+
+  test("chromedriver_unittests") {
+    sources = rebase_path(gypi_values.chrome_driver_unittests_sources,
+                          ".",
+                          "//chrome")
+
+    deps = [
+      ":chromedriver_lib",
+      "//base",
+      "//base/test:run_all_unittests",
+      "//net",
+      "//net:http_server",
+      "//testing/gtest",
+      "//ui/base",
+      "//ui/gfx",
+      "//ui/gfx/geometry",
+    ]
+  }
+
+  static_library("chromedriver_lib")  {
+    sources = rebase_path(gypi_values.chrome_driver_lib_sources,
+                          ".",
+                          "//chrome")
+
+    deps = [
+      ":automation_client_lib",
+      ":version",
+      "//base",
+      "//base/third_party/dynamic_annotations",
+      "//crypto",
+      "//net",
+      "//net:http_server",
+      "//third_party/zlib:zip",
+      "//ui/base",
+      "//ui/events:events_base",
+      "//ui/gfx",
+      "//ui/gfx/geometry",
+    ]
+  }
+
+  import("//chrome/version.gni")
+  process_version("version") {
+    visibility = [ ":chromedriver_lib" ]
+    source = "chromedriver/chrome/version.h"
+    output = "$target_gen_dir/chrome/test/chromedriver/version.h"
+  }
+
+  static_library("automation_client_lib") {
+    sources = rebase_path(gypi_values.chrome_automation_client_lib_sources,
+                          ".",
+                          "//chrome")
+    deps = [
+      "//base",
+      "//base/third_party/dynamic_annotations",
+      "//crypto",
+      "//net",
+      "//net:http_server",
+      "//third_party/zlib:zip",
+      "//ui/base",
+      "//ui/events:events_base",
+      "//ui/gfx",
+      "//ui/gfx/geometry",
+    ]
+  }
 }