Enable base::UnguessableToken typemaps in blink.

Change-Id: I667124ece0bf1d0d39b493f859a284f028550036
Reviewed-on: https://chromium-review.googlesource.com/1179963Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584422}

mojo/public/cpp/base/BUILD.gn

@@ -38,6 +38,8 @@ component("shared_typemap_traits") {
     "shared_memory_mojom_traits.h",
     "time_mojom_traits.cc",
     "time_mojom_traits.h",
+    "unguessable_token_mojom_traits.cc",
+    "unguessable_token_mojom_traits.h",
     "values_mojom_traits.cc",
     "values_mojom_traits.h",
   ]

mojo/public/cpp/base/unguessable_token.typemap

@@ -5,9 +5,8 @@
 mojom = "//mojo/public/mojom/base/unguessable_token.mojom"
 public_headers = [ "//base/unguessable_token.h" ]
 traits_headers = [ "//mojo/public/cpp/base/unguessable_token_mojom_traits.h" ]
-sources = [
-  "//mojo/public/cpp/base/unguessable_token_mojom_traits.cc",
-  "//mojo/public/cpp/base/unguessable_token_mojom_traits.h",
+public_deps = [
+  "//mojo/public/cpp/base:shared_typemap_traits",
 ]
 
 type_mappings = [ "mojo_base.mojom.UnguessableToken=base::UnguessableToken" ]

mojo/public/cpp/base/unguessable_token_mojom_traits.h

@@ -17,7 +17,7 @@ static_assert(sizeof(base::UnguessableToken) == 2 * sizeof(uint64_t),
               "base::UnguessableToken should be of size 2 * sizeof(uint64_t).");
 
 template <>
-struct COMPONENT_EXPORT(MOJO_BASE_MOJOM)
+struct COMPONENT_EXPORT(MOJO_BASE_SHARED_TRAITS)
     StructTraits<mojo_base::mojom::UnguessableTokenDataView,
                  base::UnguessableToken> {
   static uint64_t high(const base::UnguessableToken& token) {
@@ -34,4 +34,4 @@ struct COMPONENT_EXPORT(MOJO_BASE_MOJOM)
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_BASE_UNGUESSABLE_TOKEN_MOJOM_TRAITS_H_
\ No newline at end of file
+#endif  // MOJO_PUBLIC_CPP_BASE_UNGUESSABLE_TOKEN_MOJOM_TRAITS_H_

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

@@ -6,6 +6,7 @@ typemaps = [
   "//mojo/public/cpp/base/file_info.typemap",
   "//mojo/public/cpp/base/file_path.typemap",
   "//mojo/public/cpp/base/shared_memory.typemap",
+  "//mojo/public/cpp/base/unguessable_token.typemap",
   "//third_party/blink/renderer/core/messaging/blink_cloneable_message.typemap",
   "//third_party/blink/renderer/core/messaging/blink_transferable_message.typemap",
   "//third_party/blink/renderer/platform/blob/serialized_blob.typemap",