Hook up test runner to new layout_test_html_viewer

components/html_viewer/BUILD.gn

Index: components/html_viewer/BUILD.gn
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index e89592d7d025025105eaa1b69936c8cc96c76487..08cda568336f258a5d1ab3cf988def7a58829520 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -67,6 +67,8 @@ source_set("lib") {
     "blink_resource_constants.h",
     "blink_url_request_type_converters.cc",
     "blink_url_request_type_converters.h",
+    "content_handler_impl.cc",
+    "content_handler_impl.h",
     "devtools_agent_impl.cc",
     "devtools_agent_impl.h",
     "discardable_memory_allocator.cc",
@@ -82,8 +84,14 @@ source_set("lib") {
     "global_state.h",
     "html_document.cc",
     "html_document.h",
+    "html_document_application_delegate.cc",
+    "html_document_application_delegate.h",
     "html_document_oopif.cc",
     "html_document_oopif.h",
+    "html_viewer.cc",
+    "html_viewer.h",
+    "html_viewer_switches.cc",
+    "html_viewer_switches.h",
     "media_factory.cc",
     "media_factory.h",
     "mock_web_blob_registry_impl.cc",
@@ -180,15 +188,7 @@ source_set("lib") {
 
 mojo_native_application("html_viewer") {
   sources = [
-    "content_handler_impl.cc",
-    "content_handler_impl.h",
-    "html_document_application_delegate.cc",
-    "html_document_application_delegate.h",
-    "html_viewer.cc",
-    "html_viewer.h",
     "html_viewer_main.cc",
-    "html_viewer_switches.cc",
-    "html_viewer_switches.h",
   ]
   deps = [
     ":html_viewer_resources_grit",
@@ -215,6 +215,46 @@ mojo_native_application("html_viewer") {
   }
 }
 
+mojo_native_application("layout_test_html_viewer") {
+  testonly = true
+  sources = [
+    "layout_test_content_handler_impl.cc",
+    "layout_test_content_handler_impl.h",
+    "layout_test_html_viewer.cc",
+    "layout_test_html_viewer.h",
+    "layout_test_html_viewer_main.cc",
+    "web_test_delegate_impl.cc",
+    "web_test_delegate_impl.h",
+  ]
+  deps = [

[jam, 2015/07/09 16:48:27]

many of these are shared. can you move them up to lib?

[jochen (gone - plz use gerrit), 2015/07/10 07:53:43]

the dependencies on the resources need to stay, but I moved what is possible

+    ":html_viewer_resources_grit",
+    ":lib",
+    "//components/test_runner",
+    "//mojo/common",
+    "//mojo/platform_handle",
+    "//third_party/WebKit/public:blink",
+    "//third_party/WebKit/public:test_support",
+    "//third_party/icu:icudata",
+    "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
+    "//ui/resources:ui_test_pak",
+    "//url",
+  ]
+  data_deps = [ "//mojo/services/network:network" ]

[jam, 2015/07/09 16:48:27]

can we put this in the lib section since it's shared? (there are other data_deps
there)

[jochen (gone - plz use gerrit), 2015/07/10 07:53:43]

done

+  resources = [
+    "$root_out_dir/icudtl.dat",
+    "$root_out_dir/ui_test.pak",
+    "$target_gen_dir/html_viewer_resources.pak",
+  ]
+
+  if (v8_use_external_startup_data) {
+    resources += [
+      "$root_build_dir/natives_blob.bin",
+      "$root_build_dir/snapshot_blob.bin",
+    ]
+    deps += [ "//gin" ]
+  }
+}
+
 test("html_viewer_unittests") {
   sources = [
     "ax_provider_impl_unittest.cc",