Commit fddf9164 authored by alph's avatar alph Committed by Commit bot

Revert of Use common_custom_types instead of remapping base::ListValue in...

Revert of Use common_custom_types instead of remapping base::ListValue in SafeJsonParser (patchset #9 id:180001 of https://codereview.chromium.org/2121793002/ )

Reason for revert:
Broke compilation https://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Linux%20ChromeOS%20MSan%20Builder/builds/17876

Original issue's description:
> Use common_custom_types instead of remapping base::ListValue in SafeJsonParser
>
> Committed: https://crrev.com/623ad061886068c1ce323e7a499b91f61918c001
> Cr-Commit-Position: refs/heads/master@{#406139}

TBR=jochen@chromium.org,bauerb@chromium.org,dcheng@chromium.org,amistry@chromium.org,pmonette@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2158003003
Cr-Commit-Position: refs/heads/master@{#406159}
parent d5293c94
...@@ -64,15 +64,14 @@ ...@@ -64,15 +64,14 @@
# GN version: //components/safe_json/public/interfaces # GN version: //components/safe_json/public/interfaces
'target_name': 'safe_json_mojo_bindings', 'target_name': 'safe_json_mojo_bindings',
'type': 'static_library', 'type': 'static_library',
'variables': {
'mojom_typemaps': [
'safe_json/public/interfaces/safe_json.typemap',
],
},
'sources': [ 'sources': [
'safe_json/public/interfaces/safe_json.mojom', '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'], 'includes': [ '../mojo/mojom_bindings_generator.gypi'],
}, },
{ {
......
...@@ -4,7 +4,6 @@ include_rules = [ ...@@ -4,7 +4,6 @@ include_rules = [
"+content/public/utility", "+content/public/utility",
"+grit", # For generated headers "+grit", # For generated headers
"+jni", "+jni",
"+mojo/common",
"+mojo/public/cpp", "+mojo/public/cpp",
"+ui/base", "+ui/base",
] ]
...@@ -8,8 +8,4 @@ mojom("interfaces") { ...@@ -8,8 +8,4 @@ mojom("interfaces") {
sources = [ sources = [
"safe_json.mojom", "safe_json.mojom",
] ]
deps = [
"//mojo/common:common_custom_types",
]
} }
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
module safe_json.mojom; module safe_json.mojom;
import "mojo/common/common_custom_types.mojom"; [Native]
struct ListValue;
interface SafeJsonParser { interface SafeJsonParser {
Parse(string json) => (mojo.common.mojom.ListValue result, string? error); Parse(string json) => (ListValue result, string? error);
}; };
# 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" ]
...@@ -2,4 +2,7 @@ ...@@ -2,4 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
typemaps = [ "//components/autofill/content/public/cpp/autofill_types.typemap" ] typemaps = [
"//components/autofill/content/public/cpp/autofill_types.typemap",
"//components/safe_json/public/interfaces/safe_json.typemap",
]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment