Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types.

services/ui/public/interfaces/BUILD.gn

Index: services/ui/public/interfaces/BUILD.gn
diff --git a/services/ui/public/interfaces/BUILD.gn b/services/ui/public/interfaces/BUILD.gn
index 61d28e644030f598e5614ab3cc719190bd51b863..9025e7bf1848cb594cb550930a301779376e1257 100644
--- a/services/ui/public/interfaces/BUILD.gn
+++ b/services/ui/public/interfaces/BUILD.gn
@@ -5,7 +5,7 @@
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
-mojom("interfaces_use_new_wrappers") {
+mojom("interfaces") {
   sources = [
     "accessibility_manager.mojom",
     "animations.mojom",
@@ -19,31 +19,10 @@ mojom("interfaces_use_new_wrappers") {
     "mus_constants.mojom",
     "user_access_manager.mojom",
     "user_activity_monitor.mojom",
-    "window_manager_constants.mojom",
-    "window_server_test.mojom",
-  ]
-
-  import_dirs = [
-    get_path_info("../../../..", "abspath"),
-    "//mojo/services",
-  ]
-
-  public_deps = [
-    "//cc/ipc:interfaces",
-    "//gpu/ipc/common:interfaces",
-    "//services/ui/public/interfaces/display",
-    "//ui/events/mojo:interfaces",
-    "//ui/gfx/geometry/mojo",
-    "//ui/gfx/mojo",
-    "//ui/platform_window/mojo:interfaces",
-  ]
-}
-
-# TODO(yzshen): merge this target into the one above.
-mojom("interfaces") {
-  sources = [
     "window_manager.mojom",
+    "window_manager_constants.mojom",
     "window_manager_window_tree_factory.mojom",
+    "window_server_test.mojom",
     "window_tree.mojom",
     "window_tree_constants.mojom",
     "window_tree_host.mojom",
@@ -56,7 +35,6 @@ mojom("interfaces") {
 
   public_deps = [
     ":constants",
-    ":interfaces_use_new_wrappers",
     "//cc/ipc:interfaces",
     "//gpu/ipc/common:interfaces",
     "//services/ui/public/interfaces/display",
@@ -65,8 +43,6 @@ mojom("interfaces") {
     "//ui/gfx/mojo",
     "//ui/platform_window/mojo:interfaces",
   ]
-
-  use_new_wrapper_types = false
 }
 
 mojom("constants") {