chromeos: renames //ash/public/cpp:ash_public_cpp to just cpp

This name better matches what we do else where.

BUG=none
TEST=none

Change-Id: I8e820ec89c45b09844caba3f8b450a23449c108f
Reviewed-on: https://chromium-review.googlesource.com/775879
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517860}

ash/BUILD.gn

@@ -999,7 +999,7 @@ component("ash") {
   defines = [ "ASH_IMPLEMENTATION" ]
 
   public_deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
@@ -1136,7 +1136,7 @@ component("ash_with_content") {
     ":ash",
   ]
   deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
@@ -1197,7 +1197,7 @@ static_library("ash_shell_lib") {
   deps = [
     ":ash",
     ":test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base:i18n",
     "//components/user_manager",
@@ -1233,7 +1233,7 @@ static_library("ash_shell_lib_with_content") {
     ":ash_shell_lib",
     ":ash_with_content",
     ":test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base:i18n",
     "//chrome:packed_resources",
     "//chromeos",
@@ -1274,7 +1274,7 @@ test("ash_content_unittests") {
     ":ash",
     ":ash_with_content",
     ":test_support_with_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//chromeos",
@@ -1541,7 +1541,7 @@ test("ash_unittests") {
     ":ash",
     ":test_support_without_content",
     "//ash/autoclick/common:autoclick",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//ash/public/cpp:unit_tests",
     "//ash/resources",
     "//ash/resources/vector_icons",
@@ -1625,7 +1625,7 @@ test("ash_perftests") {
 
   deps = [
     ":test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base/test:test_support",
     "//cc/base",
     "//mojo/edk/embedder:headers",
@@ -1823,7 +1823,7 @@ static_library("test_support_common") {
   ]
   deps = [
     "//ash",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//ash/public/interfaces:test_interfaces",
     "//ash/resources",
     "//base",
@@ -1980,7 +1980,7 @@ source_set("mash_unittests") {
     ":ash_service_resources",
     "//ash",
     "//ash:test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_config",
     "//base/test:test_support",

ash/autoclick/mus/BUILD.gn

@@ -16,7 +16,7 @@ source_set("lib") {
   deps = [
     "//ash/autoclick/common:autoclick",
     "//ash/autoclick/mus/public/interfaces",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//mash/public/interfaces",
     "//mojo/common",

ash/public/cpp/BUILD.gn

@@ -5,7 +5,7 @@
 import("//mojo/public/tools/bindings/mojom.gni")
 
 # C++ headers and sources that can be used outside ash.
-component("ash_public_cpp") {
+component("cpp") {
   sources = [
     "accessibility_types.h",
     "app_types.h",
@@ -81,6 +81,8 @@ component("ash_public_cpp") {
 
   allow_circular_includes_from =
       [ "//ash/public/interfaces:interfaces_internal" ]
+
+  output_name = "ash_public_cpp"
 }
 
 # Using a test service because the traits need to pass handles around. Revisit
@@ -105,7 +107,7 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":ash_public_cpp",
+    ":cpp",
     ":test_interfaces",
     "//base",
     "//testing/gtest",

ash/public/interfaces/BUILD.gn

@@ -4,10 +4,10 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-# Depend upon //ash/public/cpp:ash_public_cpp, which has a public_dep on this.
-# The two targets must be bundled together as the typemaps depend upon
-# //ash/public/cpp, and //ash/public/cpp needs to depend on this for generated
-# code (such as enums and constants).
+# Depend upon //ash/public/cpp, which has a public_dep on this. The two targets
+# must be bundled together as the typemaps depend upon //ash/public/cpp,
+# and //ash/public/cpp needs to depend on this for generated code (such as
+# enums and constants).
 mojom("interfaces_internal") {
   visibility = [ "//ash/public/cpp:*" ]
 

ash/touch_hud/mus/BUILD.gn

@@ -14,7 +14,7 @@ source_set("lib") {
   ]
 
   deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//ash/touch_hud",
     "//base",
     "//mash/public/interfaces",

ash/wayland/BUILD.gn

@@ -11,7 +11,7 @@ source_set("wayland") {
   ]
 
   deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//components/exo",
     "//components/exo/wayland",

chrome/browser/BUILD.gn

@@ -4071,7 +4071,7 @@ split_static_library("browser") {
       ]
     }
     if (is_chromeos) {
-      deps += [ "//ash/public/cpp:ash_public_cpp" ]
+      deps += [ "//ash/public/cpp" ]
     }
   }
 }

chrome/browser/chromeos/BUILD.gn

@@ -47,7 +47,7 @@ source_set("chromeos") {
     "//ash",
     "//ash:ash_with_content",
     "//ash/autoclick/mus/public/interfaces",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//cc/paint",
     "//chrome/app:command_ids",
     "//chrome/app/vector_icons",

chrome/browser/extensions/BUILD.gn

@@ -976,7 +976,7 @@ static_library("extensions") {
     }
     deps += [
       "//ash",
-      "//ash/public/cpp:ash_public_cpp",
+      "//ash/public/cpp",
       "//components/arc",
       "//components/chrome_apps",
       "//components/constrained_window",

chrome/browser/ui/BUILD.gn

@@ -1501,7 +1501,7 @@ split_static_library("ui") {
     deps += [
       "//ash",
       "//ash:ash_with_content",
-      "//ash/public/cpp:ash_public_cpp",
+      "//ash/public/cpp",
       "//ash/resources/vector_icons",
       "//ash/strings",
       "//chrome/browser/chromeos",
@@ -3734,7 +3734,7 @@ static_library("test_support") {
       "ash/test_wallpaper_controller.cc",
       "ash/test_wallpaper_controller.h",
     ]
-    deps += [ "//ash/public/cpp:ash_public_cpp" ]
+    deps += [ "//ash/public/cpp" ]
   }
 
   if (enable_extensions) {

components/arc/BUILD.gn

@@ -62,7 +62,7 @@ static_library("arc") {
 
   deps = [
     "//ash:ash",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//chromeos",
     "//chromeos:login_manager_proto",
@@ -138,7 +138,7 @@ static_library("arc_base") {
   ]
 
   deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//chromeos",
     "//components/keyed_service/content",
@@ -266,7 +266,7 @@ source_set("unit_tests") {
 
   deps = [
     ":arc_test_support",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//chromeos",

components/exo/BUILD.gn

@@ -60,7 +60,7 @@ source_set("exo") {
   ]
 
   deps = [
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//cc",
     "//components/viz/service",
@@ -103,7 +103,7 @@ source_set("test_support") {
   deps = [
     ":exo",
     "//ash:test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//gpu",
     "//skia",
@@ -141,7 +141,7 @@ source_set("unit_tests") {
     ":test_support",
     "//ash",
     "//ash:test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//cc",
@@ -181,7 +181,7 @@ test("exo_unittests") {
   deps = [
     ":unit_tests",
     "//ash:test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//cc:test_support",

components/exo/wayland/BUILD.gn

@@ -63,7 +63,7 @@ source_set("wayland") {
 
   deps = [
     ":aura_shell_protocol",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//components/exo",
     "//device/gamepad",
@@ -313,7 +313,7 @@ test("wayland_client_perftests") {
     ":wayland",
     "//ash",
     "//ash:test_support_without_content",
-    "//ash/public/cpp:ash_public_cpp",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//cc:test_support",

mash/BUILD.gn

@@ -98,7 +98,7 @@ if (is_chromeos) {
       "//ash:ash_service_resources",
       "//ash:mash_unittests",
       "//ash:test_support_without_content",
-      "//ash/public/cpp:ash_public_cpp",
+      "//ash/public/cpp",
       "//base",
       "//base/test:test_support",
       "//cc",

mash/common/BUILD.gn

@@ -15,6 +15,6 @@ source_set("common") {
   ]
 
   if (is_chromeos) {
-    deps += [ "//ash/public/cpp:ash_public_cpp" ]
+    deps += [ "//ash/public/cpp" ]
   }
 }