ash: Fix asan build failure

Recent changes revealed a deps problem that app list type
mapping depends on app_list_types.h/cc but it is not listed
and causing "get_accessible_interfaces" fail to link on
asan bots.

Bug: 963132
Change-Id: Ie65d2abe0db751486d643bcb7ea0bebbad764f04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612228
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Sam McNally <sammc@chromium.org>
Auto-Submit: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659775}

ash/public/cpp/BUILD.gn

@@ -17,8 +17,6 @@ component("cpp") {
     "app_list/app_list_metrics.h",
     "app_list/app_list_switches.cc",
     "app_list/app_list_switches.h",
-    "app_list/app_list_types.cc",
-    "app_list/app_list_types.h",
     "app_list/internal_app_id_constants.h",
     "app_list/term_break_iterator.cc",
     "app_list/term_break_iterator.h",
@@ -35,7 +33,6 @@ component("cpp") {
     "ash_features.h",
     "ash_pref_names.cc",
     "ash_pref_names.h",
-    "ash_public_export.h",
     "ash_switches.cc",
     "ash_switches.h",
     "ash_typography.cc",
@@ -168,6 +165,7 @@ component("cpp") {
   ]
 
   public_deps = [
+    ":base",
     "//ash/public/interfaces:interfaces_internal",
     "//base",
     "//components/session_manager:base",
@@ -180,6 +178,23 @@ component("cpp") {
   output_name = "ash_public_cpp"
 }
 
+# This is listed separately because app_list.mojom type mapping depends on it
+# but //ash/public/interfaces could not depend on //ash/public/cpp.
+# TODO(crbug.com/958134): Move this back when app_list.mojom is gone.
+source_set("base") {
+  sources = [
+    "app_list/app_list_types.cc",
+    "app_list/app_list_types.h",
+    "ash_public_export.h",
+  ]
+
+  defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
+
+  public_deps = [
+    "//ui/gfx",
+  ]
+}
+
 source_set("manifest") {
   sources = [
     "manifest.cc",

ash/public/interfaces/app_list.typemap

@@ -8,6 +8,9 @@ traits_headers = [ "//ash/public/cpp/app_list/app_list_struct_traits.h" ]
 sources = [
   "//ash/public/cpp/app_list/app_list_struct_traits.cc",
 ]
+deps = [
+  "//ash/public/cpp:base",
+]
 type_mappings = [
   "ash.mojom.AppListState=ash::AppListState",
   "ash.mojom.AppListModelStatus=ash::AppListModelStatus",