Revert "Migrate URL and Origin typemaps to GN definitions"

This reverts commit 1b21e379.

Reason for revert: prereq for reverting #748056, 
https://crbug.com/1059666

Original change's description:
> Migrate URL and Origin typemaps to GN definitions
> 
> Also moves some longer bits of code out-of-line.
> 
> Bug: 1059389
> Change-Id: Idd1b3606e26504ab92e9aefebc933823919a2431
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092695
> Commit-Queue: Ken Rockot <rockot@google.com>
> Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#748058}

TBR=dcheng@chromium.org,rockot@google.com,dtapuska@chromium.org

Change-Id: I2573e9bea2f125e5dafe7a1d9b9b46ac1d12025a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1059389
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095216Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748193}

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -61,6 +61,7 @@ _typemap_imports = [
   "//ui/gfx/typemaps.gni",
   "//ui/gl/typemaps.gni",
   "//ui/latency/mojom/typemaps.gni",
+  "//url/mojom/typemaps.gni",
 ]
 
 _typemaps = []

third_party/blink/renderer/platform/mojo/BUILD.gn

@@ -18,38 +18,3 @@ mojom_cpp_typemap("big_string_typemap") {
   ]
   public_deps = [ "//mojo/public/cpp/base" ]
 }
-
-mojom_cpp_typemap("url_typemap") {
-  types = [
-    {
-      mojom = "url.mojom.Url"
-      cpp = "::blink::KURL"
-      force_serialize = true
-    },
-  ]
-  public_headers = [
-    "//third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h",
-    "//third_party/blink/renderer/platform/weborigin/kurl.h",
-    "//third_party/blink/renderer/platform/weborigin/kurl_hash.h",
-  ]
-
-  # NOTE: Consumers of this typemap must themselves depend on platform.
-  public_deps = [ "//url" ]
-}
-
-mojom_cpp_typemap("origin_typemap") {
-  types = [
-    {
-      mojom = "url.mojom.Origin"
-      cpp = "::scoped_refptr<const ::blink::SecurityOrigin>"
-      nullable_is_same_type = true
-    },
-  ]
-  public_headers = [
-    "//third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h",
-    "//third_party/blink/renderer/platform/weborigin/security_origin.h",
-  ]
-
-  # NOTE: Consumers of this typemap must themselves depend on platform.
-  public_deps = [ "//url" ]
-}

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -22,6 +22,8 @@ typemaps = [
   "//third_party/blink/renderer/platform/blob/serialized_blob.typemap",
   "//third_party/blink/renderer/platform/cookie/canonical_cookie.typemap",
   "//third_party/blink/renderer/platform/mojo/fetch_api_request_headers.typemap",
+  "//third_party/blink/renderer/platform/mojo/kurl.typemap",
+  "//third_party/blink/renderer/platform/mojo/security_origin.typemap",
   "//third_party/blink/renderer/platform/mojo/string.typemap",
   "//third_party/blink/renderer/platform/mojo/time.typemap",
   "//third_party/blink/renderer/platform/network/encoded_form_data_element.typemap",

third_party/blink/renderer/platform/mojo/kurl.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 = "//url/mojom/url.mojom"
+public_headers = [
+  "//third_party/blink/renderer/platform/weborigin/kurl.h",
+  "//third_party/blink/renderer/platform/weborigin/kurl_hash.h",
+]
+traits_headers =
+    [ "//third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h" ]
+
+# Note: consumers of this typemap must themselves depend on platform.
+deps = [
+  "//mojo/public/cpp/bindings",
+  "//url",
+]
+type_mappings = [ "url.mojom.Url=::blink::KURL[force_serialize]" ]

third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h

@@ -5,16 +5,15 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_KURL_MOJOM_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_KURL_MOJOM_TRAITS_H_
 
-#include "mojo/public/cpp/bindings/string_traits_wtf.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "url/mojom/url.mojom-shared.h"
+#include "url/mojom/url.mojom-blink-forward.h"
 #include "url/url_constants.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<url::mojom::UrlDataView, ::blink::KURL> {
+struct StructTraits<url::mojom::blink::Url::DataView, ::blink::KURL> {
   static WTF::String url(const ::blink::KURL& blinkUrl) {
     if (!blinkUrl.IsValid() ||
         blinkUrl.GetString().length() > url::kMaxURLChars) {
@@ -23,7 +22,7 @@ struct StructTraits<url::mojom::UrlDataView, ::blink::KURL> {
 
     return blinkUrl.GetString();
   }
-  static bool Read(url::mojom::UrlDataView data, ::blink::KURL* out) {
+  static bool Read(url::mojom::blink::Url::DataView data, ::blink::KURL* out) {
     WTF::String urlString;
     if (!data.ReadUrl(&urlString))
       return false;

third_party/blink/renderer/platform/mojo/security_origin.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 = "//url/mojom/origin.mojom"
+public_headers =
+    [ "//third_party/blink/renderer/platform/weborigin/security_origin.h" ]
+traits_headers = [
+  "//third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h",
+]
+
+# Note: consumers of this typemap must themselves depend on platform.
+deps = [
+  "//mojo/public/cpp/bindings",
+  "//url",
+]
+type_mappings = [ "url.mojom.Origin=::scoped_refptr<const ::blink::SecurityOrigin>[nullable_is_same_type]" ]

third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h

@@ -5,12 +5,10 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_SECURITY_ORIGIN_MOJOM_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_SECURITY_ORIGIN_MOJOM_TRAITS_H_
 
-#include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
-#include "mojo/public/cpp/bindings/string_traits_wtf.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "url/mojom/origin.mojom-shared.h"
+#include "url/mojom/origin.mojom-blink-forward.h"
 #include "url/scheme_host_port.h"
 
 namespace mojo {
@@ -47,7 +45,7 @@ struct UrlOriginAdapter {
 };
 
 template <>
-struct StructTraits<url::mojom::OriginDataView,
+struct StructTraits<url::mojom::blink::Origin::DataView,
                     scoped_refptr<const ::blink::SecurityOrigin>> {
   static WTF::String scheme(
       const scoped_refptr<const ::blink::SecurityOrigin>& origin) {
@@ -67,7 +65,7 @@ struct StructTraits<url::mojom::OriginDataView,
       const scoped_refptr<const ::blink::SecurityOrigin>& origin) {
     return UrlOriginAdapter::nonce_if_opaque(origin);
   }
-  static bool Read(url::mojom::OriginDataView data,
+  static bool Read(url::mojom::blink::Origin::DataView data,
                    scoped_refptr<const ::blink::SecurityOrigin>* out) {
     // This implementation is very close to
     // SecurityOrigin::CreateFromUrlOrigin, so keep in sync if modifications

url/mojom/BUILD.gn

@@ -7,9 +7,6 @@ import("//mojo/public/tools/bindings/mojom.gni")
 mojom("url_mojom_gurl") {
   generate_java = true
   sources = [ "url.mojom" ]
-  cpp_typemaps = [ ":url_typemap" ]
-  blink_cpp_typemaps =
-      [ "//third_party/blink/renderer/platform/mojo:url_typemap" ]
 }
 
 mojom("url_mojom_origin") {
@@ -22,10 +19,6 @@ mojom("url_mojom_origin") {
   ]
 
   check_includes_blink = false
-
-  cpp_typemaps = [ ":origin_typemap" ]
-  blink_cpp_typemaps =
-      [ "//third_party/blink/renderer/platform/mojo:origin_typemap" ]
 }
 
 mojom("test_url_mojom_gurl") {
@@ -36,58 +29,3 @@ mojom("test_url_mojom_gurl") {
     ":url_mojom_origin",
   ]
 }
-
-component("mojom_traits") {
-  output_name = "url_mojom_traits"
-
-  sources = [
-    "origin_mojom_traits.cc",
-    "origin_mojom_traits.h",
-    "url_gurl_mojom_traits.cc",
-    "url_gurl_mojom_traits.h",
-  ]
-
-  defines = [ "IS_URL_MOJOM_TRAITS_IMPL" ]
-
-  public_deps = [
-    ":url_mojom_gurl_shared",
-    ":url_mojom_origin_shared",
-    "//base",
-    "//mojo/public/cpp/base:shared_typemap_traits",
-    "//url",
-  ]
-}
-
-mojom_cpp_typemap("url_typemap") {
-  types = [
-    {
-      mojom = "url.mojom.Url"
-      cpp = "::GURL"
-    },
-  ]
-  public_headers = [
-    "//url/gurl.h",
-    "//url/mojom/url_gurl_mojom_traits.h",
-  ]
-  public_deps = [
-    ":mojom_traits",
-    "//url",
-  ]
-}
-
-mojom_cpp_typemap("origin_typemap") {
-  types = [
-    {
-      mojom = "url.mojom.Origin"
-      cpp = "::url::Origin"
-    },
-  ]
-  public_headers = [
-    "//url/origin.h",
-    "//url/mojom/origin_mojom_traits.h",
-  ]
-  public_deps = [
-    ":mojom_traits",
-    "//url",
-  ]
-}

url/mojom/OWNERS

@@ -2,4 +2,6 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *.typemap=set noparent
+per-file *.typemap=file://ipc/SECURITY_OWNERS
 # COMPONENT: Internals>Mojo

url/mojom/gurl.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 = "//url/mojom/url.mojom"
+public_headers = [ "//url/gurl.h" ]
+traits_headers = [ "//url/mojom/url_gurl_mojom_traits.h" ]
+deps = [
+  "//url",
+]
+type_mappings = [ "url.mojom.Url=::GURL" ]

url/mojom/origin.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 = "//url/mojom/origin.mojom"
+public_headers = [ "//url/origin.h" ]
+traits_headers = [ "//url/mojom/origin_mojom_traits.h" ]
+deps = [
+  "//url",
+]
+type_mappings = [ "url.mojom.Origin=::url::Origin" ]

url/mojom/origin_mojom_traits.cc

-// Copyright 2020 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.
-
-#include "url/mojom/origin_mojom_traits.h"
-
-#include "base/strings/string_piece.h"
-
-namespace mojo {
-
-// static
-bool StructTraits<url::mojom::OriginDataView, url::Origin>::Read(
-    url::mojom::OriginDataView data,
-    url::Origin* out) {
-  base::StringPiece scheme, host;
-  base::Optional<base::UnguessableToken> nonce_if_opaque;
-  if (!data.ReadScheme(&scheme) || !data.ReadHost(&host) ||
-      !data.ReadNonceIfOpaque(&nonce_if_opaque))
-    return false;
-
-  base::Optional<url::Origin> creation_result =
-      nonce_if_opaque
-          ? url::Origin::UnsafelyCreateOpaqueOriginWithoutNormalization(
-                scheme, host, data.port(), url::Origin::Nonce(*nonce_if_opaque))
-          : url::Origin::UnsafelyCreateTupleOriginWithoutNormalization(
-                scheme, host, data.port());
-  if (!creation_result)
-    return false;
-
-  *out = std::move(creation_result.value());
-  return true;
-}
-
-}  // namespace mojo

url/mojom/origin_mojom_traits.h

@@ -5,18 +5,16 @@
 #ifndef URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
 #define URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
 
-#include "base/component_export.h"
-#include "base/optional.h"
+#include "base/strings/string_piece.h"
 #include "base/unguessable_token.h"
 #include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
-#include "url/mojom/origin.mojom-shared.h"
+#include "url/mojom/origin.mojom.h"
 #include "url/origin.h"
 
 namespace mojo {
 
 template <>
-struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
-    StructTraits<url::mojom::OriginDataView, url::Origin> {
+struct StructTraits<url::mojom::OriginDataView, url::Origin> {
   static const std::string& scheme(const url::Origin& r) {
     return r.GetTupleOrPrecursorTupleIfOpaque().scheme();
   }
@@ -31,7 +29,26 @@ struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
     // TODO(nasko): Consider returning a const reference here.
     return r.GetNonceForSerialization();
   }
-  static bool Read(url::mojom::OriginDataView data, url::Origin* out);
+  static bool Read(url::mojom::OriginDataView data, url::Origin* out) {
+    base::StringPiece scheme, host;
+    base::Optional<base::UnguessableToken> nonce_if_opaque;
+    if (!data.ReadScheme(&scheme) || !data.ReadHost(&host) ||
+        !data.ReadNonceIfOpaque(&nonce_if_opaque))
+      return false;
+
+    base::Optional<url::Origin> creation_result =
+        nonce_if_opaque
+            ? url::Origin::UnsafelyCreateOpaqueOriginWithoutNormalization(
+                  scheme, host, data.port(),
+                  url::Origin::Nonce(*nonce_if_opaque))
+            : url::Origin::UnsafelyCreateTupleOriginWithoutNormalization(
+                  scheme, host, data.port());
+    if (!creation_result)
+      return false;
+
+    *out = std::move(creation_result.value());
+    return true;
+  }
 };
 
 }  // namespace mojo

url/mojom/typemaps.gni

+# 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.
+
+typemaps = [
+  "//url/mojom/origin.typemap",
+  "//url/mojom/gurl.typemap",
+]

url/mojom/url_gurl_mojom_traits.cc

-// Copyright 2020 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.
-
-#include "url/mojom/url_gurl_mojom_traits.h"
-
-#include "url/url_constants.h"
-
-namespace mojo {
-
-// static
-base::StringPiece StructTraits<url::mojom::UrlDataView, GURL>::url(
-    const GURL& r) {
-  if (r.possibly_invalid_spec().length() > url::kMaxURLChars || !r.is_valid()) {
-    return base::StringPiece();
-  }
-
-  return base::StringPiece(r.possibly_invalid_spec().c_str(),
-                           r.possibly_invalid_spec().length());
-}
-
-// static
-bool StructTraits<url::mojom::UrlDataView, GURL>::Read(
-    url::mojom::UrlDataView data,
-    GURL* out) {
-  base::StringPiece url_string;
-  if (!data.ReadUrl(&url_string))
-    return false;
-
-  if (url_string.length() > url::kMaxURLChars)
-    return false;
-
-  *out = GURL(url_string);
-  if (!url_string.empty() && !out->is_valid())
-    return false;
-
-  return true;
-}
-
-}  // namespace mojo

url/mojom/url_gurl_mojom_traits.h

@@ -5,19 +5,38 @@
 #ifndef URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 #define URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 
-#include "base/component_export.h"
 #include "base/strings/string_piece.h"
-#include "mojo/public/cpp/bindings/struct_traits.h"
 #include "url/gurl.h"
-#include "url/mojom/url.mojom-shared.h"
+#include "url/mojom/url.mojom.h"
+#include "url/url_constants.h"
 
 namespace mojo {
 
 template <>
-struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
-    StructTraits<url::mojom::UrlDataView, GURL> {
-  static base::StringPiece url(const GURL& r);
-  static bool Read(url::mojom::UrlDataView data, GURL* out);
+struct StructTraits<url::mojom::UrlDataView, GURL> {
+  static base::StringPiece url(const GURL& r) {
+    if (r.possibly_invalid_spec().length() > url::kMaxURLChars ||
+        !r.is_valid()) {
+      return base::StringPiece();
+    }
+
+    return base::StringPiece(r.possibly_invalid_spec().c_str(),
+                             r.possibly_invalid_spec().length());
+  }
+  static bool Read(url::mojom::UrlDataView data, GURL* out) {
+    base::StringPiece url_string;
+    if (!data.ReadUrl(&url_string))
+      return false;
+
+    if (url_string.length() > url::kMaxURLChars)
+      return false;
+
+    *out = GURL(url_string);
+    if (!url_string.empty() && !out->is_valid())
+      return false;
+
+    return true;
+  }
 };
 
 }  // namespace mojo