[Fuchsia] cleanup target names under //webrunner

Renamed targets under //webrunner as follows:
  service_unittests -> webrunner_unittests
  runner_pkg -> webrunner_pkg
  runner_exe -> webrunner_exe
  runner -> webrunner

Bug: 852145
Change-Id: Id92d021d29e7fada81153d70440b6376052e3abd
Reviewed-on: https://chromium-review.googlesource.com/1138992
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575787}

diff --git a/BUILD.gn b/BUILD.gn
index aa5bd5ae..5b5e15d 100644
--- a/BUILD.gn
+++ b/BUILD.gn

@@ -739,6 +739,7 @@
       "//headless:headless_shell",
       "//headless:headless_tests",
       "//webrunner",
+      "//webrunner:webrunner_unittests",
     ]
   }
 }

diff --git a/build/config/fuchsia/rules.gni b/build/config/fuchsia/rules.gni
index 6792c07c..85c9265 100644
--- a/build/config/fuchsia/rules.gni
+++ b/build/config/fuchsia/rules.gni

@@ -16,7 +16,8 @@
 # Parameters:
 #   package: The package() target which will be run.
 #   package_name_override: Specifies the name of the generated package, if its
-#       name is different than the |package| target name.
+#       name is different than the |package| target name. This value must match
+#       package_name_override in the |package| target.
 #   package_deps: An array of [package, package_name_override] array pairs
 #       which specify additional dependency packages to be installed
 #       prior to execution.

diff --git a/webrunner/BUILD.gn b/webrunner/BUILD.gn
index 7673d94..3e961b6 100644
--- a/webrunner/BUILD.gn
+++ b/webrunner/BUILD.gn

@@ -13,24 +13,13 @@
   defines = [ "WEBRUNNER_IMPLEMENTATION" ]
 }
 
-# Uber-target, used by buildbots and :gn_all for discovery of all buildable
-# webrunner code.
-group("webrunner") {
-  testonly = true
-  deps = [
-    ":runner_pkg",
-    ":service_pkg",
-    ":service_unittests",
-  ]
-}
-
-fuchsia_package("runner_pkg") {
-  binary = ":runner_exe"
+fuchsia_package("webrunner_pkg") {
+  binary = ":webrunner_exe"
   package_name_override = "web_runner"
 }
 
-fuchsia_package_runner("runner") {
-  package = ":runner_pkg"
+fuchsia_package_runner("webrunner") {
+  package = ":webrunner_pkg"
   package_name_override = "web_runner"
   package_deps = [ [
         ":service_pkg",
@@ -38,7 +27,7 @@
       ] ]
 }
 
-executable("runner_exe") {
+executable("webrunner_exe") {
   sources = [
     "app/component_controller_impl.cc",
     "app/component_controller_impl.h",
@@ -72,7 +61,7 @@
 
 fuchsia_package_runner("service_runner") {
   package = ":service_pkg"
-  package_name_override = "web_service"
+  package_name_override = "chromium"
 }
 
 component("service_lib") {
@@ -174,7 +163,7 @@
   output = "$root_out_dir/webrunner.pak"
 }
 
-test("service_unittests") {
+test("webrunner_unittests") {
   sources = [
     "service/context_provider_impl_unittest.cc",
   ]