Adds support for headless chrome embedder mojo services

headless/BUILD.gn

Index: headless/BUILD.gn
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 27b83f03b5d5d67923e6deab1aeb4f2792fefd10..fb55973daf7c4956513932711e332e8ae81095fa 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
@@ -25,7 +26,6 @@ repack("pak") {
     "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
-    "$root_gen_dir/headless/headless_lib_resources.pak",

[Sami, 2016/06/27 11:10:41]

Did you mean to drop this?

[alex clarke (OOO till 29th), 2016/06/27 11:35:52]

Oops no.

     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
@@ -250,6 +250,10 @@ static_library("headless_lib") {
     "public/internal/value_conversions.h",
     "public/util/error_reporter.cc",
     "public/util/error_reporter.h",
+    "public/util/kv_map_protocol_handler.cc",
+    "public/util/kv_map_protocol_handler.h",
+    "public/util/kv_map_request_job.cc",
+    "public/util/kv_map_request_job.h",
   ]
 
   deps = [
@@ -316,8 +320,41 @@ action("client_api_generator_tests") {
   ]
 }
 
+mojom("embedder_mojo_for_testing") {
+  sources = [
+    "lib/embedder_test.mojom",
+  ]
+}
+
+grit("headless_browsertest_resources_grit") {
+  source = "lib/headless_browsertest_resources.grd"
+  outputs = [
+    "grit/headless_browsertest_resources.h",
+    "$root_gen_dir/headless/headless_browsertest_resources.pak",
+  ]
+  grit_flags = [
+    "-E",
+    "mojom_root=" + rebase_path(root_gen_dir),
+  ]
+  deps = [
+    ":embedder_mojo_for_testing__generator",
+  ]
+  resource_ids = "lib/headless_browsertest_resource_ids"
+}
+
+repack("headless_browser_tests_pak") {
+  sources = [
+    "$root_gen_dir/headless/headless_browsertest_resources.pak",
+  ]
+  output = "$root_out_dir/headless_browser_tests.pak"
+  deps = [
+    ":headless_browsertest_resources_grit",
+  ]
+}
+
 test("headless_browsertests") {
   sources = [
+    "lib/embedder_mojo_browsertest.cc",
     "lib/headless_browser_browsertest.cc",
     "lib/headless_browser_context_browsertest.cc",
     "lib/headless_devtools_client_browsertest.cc",
@@ -331,9 +368,15 @@ test("headless_browsertests") {
     "test/test_url_request_job.h",
   ]
 
+  data = [
+    "$root_out_dir/headless_browser_tests.pak",
+  ]
+
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
+    ":embedder_mojo_for_testing",
+    ":headless_browser_tests_pak",
     "//base",
     "//content/test:browsertest_base",
     "//content/test:test_support",