[fuchsia] Move webinstance_host_integration_test

Move the webinstance host integration test out of webengine as a
`source_set`. It will still be executed with the rest of
web_engine_integration_tests.

Bug: 1081525
Change-Id: Ica82e1e468ae76d099578ab2cf274d4b86e4bc19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3769340
Reviewed-by: Wez <[email protected]>
Reviewed-by: David Dorwin <[email protected]>
Reviewed-by: David Benjamin <[email protected]>
Commit-Queue: Guocheng Wei <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1034050}

Author: Guocheng Wei

fuchsia_web/webengine/BUILD.gn

@@ -473,7 +473,10 @@ fuchsia_package_installer("web_engine_with_webui_installer") {
 
 # TODO(crbug.com/1081525): Move to ../common/test.
 source_set("browsertest_core") {
-  visibility += [ "//fuchsia_web/runners:*" ]
+  visibility += [
+    "//fuchsia_web/runners:*",
+    "//fuchsia_web/webinstance_host:*",
+  ]
   testonly = true
   sources = [
     "test/frame_for_test.cc",
@@ -666,10 +669,6 @@ test("web_engine_integration_tests") {
     "web_engine_integration_test.cc",
     "web_engine_integration_test_base.cc",
     "web_engine_integration_test_base.h",
-
-    # TODO(crbug.com/1081525): Move to //fuchsia_web/webinstance_host/ and
-    # remove the deps below.
-    "web_instance_host_integration_test.cc",
   ]
   data = [ "test/data" ]
   deps = [
@@ -679,7 +678,7 @@ test("web_engine_integration_tests") {
     "//components/version_info",
     "//fuchsia_web/common/test:run_all_integration_tests",
     "//fuchsia_web/common/test:test_support",
-    "//fuchsia_web/webinstance_host",
+    "//fuchsia_web/webinstance_host:webinstance_host_integration_test",
     "//media",
     "//media/fuchsia/audio:test_support",
     "//media/fuchsia/camera:test_support",

fuchsia_web/webinstance_host/BUILD.gn

@@ -4,7 +4,7 @@
 
 assert(is_fuchsia)
 
-visibility = []
+visibility = [ ":*" ]
 
 source_set("webinstance_host") {
   assert_no_deps = [
@@ -19,10 +19,6 @@ source_set("webinstance_host") {
     "//fuchsia_web/runners/*",
     "//fuchsia_web/shell:*",
     "//fuchsia_web/webengine:context_provider",
-
-    # TODO(crbug.com/1081525): Move dependent tests into this directory and
-    # source_sets that have these deps.
-    "//fuchsia_web/webengine:web_engine_integration_tests__exec",
   ]
   sources = [
     "fuchsia_web_debug_proxy.cc",
@@ -53,3 +49,18 @@ source_set("webinstance_host") {
     "//third_party/fuchsia-sdk/sdk/pkg/fidl",
   ]
 }
+
+source_set("webinstance_host_integration_test") {
+  testonly = true
+  visibility += [ "//fuchsia_web/webengine/*" ]
+  sources = [ "web_instance_host_integration_test.cc" ]
+  deps = [
+    ":webinstance_host",
+    "//base",
+    "//fuchsia_web/common/test:test_support",
+    "//fuchsia_web/webengine:browsertest_core",
+    "//net:test_support",
+    "//testing/gtest",
+    "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
+  ]
+}

fuchsia_web/webinstance_host/DEPS

@@ -1,20 +1,24 @@
 include_rules = [
   "+components/embedder_support",
   "+components/fuchsia_component_support",
-  "+content/public/common",
   "+fuchsia_web/webengine/features.h",
   "+fuchsia_web/webengine/switches.h",
-  "+gpu/config/gpu_finch_features.h",
   "+gpu/command_buffer/service/gpu_switches.h",
-  "+media/base/key_system_names.h",
-  "+media/base/media_switches.h",
+  "+gpu/config/gpu_finch_features.h",
   "+net/http/http_util.h",
   "+services/network/public/cpp/features.h",
   "+services/network/public/cpp/network_switches.h",
   "+third_party/blink/public/common/switches.h",
   "+third_party/widevine/cdm/widevine_cdm_common.h",
   "+ui/display/display_switches.h",
-  "+ui/gl/gl_switches.h",
   "+ui/gfx/switches.h",
+  "+ui/gl/gl_switches.h",
   "+ui/ozone/public/ozone_switches.h",
 ]
+
+specific_include_rules = {
+  "web_instance_host_integration_test\.cc": [
+    "+fuchsia_web/webengine/test/frame_for_test.h",
+    "+net/test/embedded_test_server",
+  ],
+}