Use common_custom_types instead of remapping base::ListValue in SafeJsonParser

Review-Url: https://codereview.chromium.org/2121793002
Cr-Commit-Position: refs/heads/master@{#406139}

components/safe_json.gypi

@@ -64,14 +64,15 @@
       # GN version: //components/safe_json/public/interfaces
       'target_name': 'safe_json_mojo_bindings',
       'type': 'static_library',
-      'variables': {
-        'mojom_typemaps': [
-          'safe_json/public/interfaces/safe_json.typemap',
-        ],
-      },
       'sources': [
         'safe_json/public/interfaces/safe_json.mojom',
       ],
+      'dependencies': [
+        '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom',
+      ],
+      'export_dependent_settings':[
+        '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom',
+      ],
       'includes': [ '../mojo/mojom_bindings_generator.gypi'],
     },
     {

components/safe_json/DEPS

@@ -4,6 +4,7 @@ include_rules = [
   "+content/public/utility",
   "+grit",  # For generated headers
   "+jni",
+  "+mojo/common",
   "+mojo/public/cpp",
   "+ui/base",
 ]

components/safe_json/public/interfaces/BUILD.gn

@@ -8,4 +8,8 @@ mojom("interfaces") {
   sources = [
     "safe_json.mojom",
   ]
+
+  deps = [
+    "//mojo/common:common_custom_types",
+  ]
 }

components/safe_json/public/interfaces/safe_json.mojom

@@ -4,9 +4,8 @@
 
 module safe_json.mojom;
 
-[Native]
-struct ListValue;
+import "mojo/common/common_custom_types.mojom";
 
 interface SafeJsonParser {
-  Parse(string json) => (ListValue result, string? error);
+  Parse(string json) => (mojo.common.mojom.ListValue result, string? error);
 };

components/safe_json/public/interfaces/safe_json.typemap

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//components/safe_json/public/interfaces/safe_json.mojom"
-public_headers = [ "//base/values.h" ]
-traits_headers = [ "//ipc/ipc_message_utils.h" ]
-deps = [ "//ipc" ]
-type_mappings = [ "safe_json.mojom.ListValue=base::ListValue" ]

components/typemaps.gni

@@ -2,7 +2,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-typemaps = [
-  "//components/autofill/content/public/cpp/autofill_types.typemap",
-  "//components/safe_json/public/interfaces/safe_json.typemap",
-]
+typemaps = [ "//components/autofill/content/public/cpp/autofill_types.typemap" ]