Mojo C++ bindings: some improvements for String16 struct traits.

mojo/common/common_custom_types_struct_traits.cc

Index: mojo/common/common_custom_types_struct_traits.cc
diff --git a/mojo/common/common_custom_types_struct_traits.cc b/mojo/common/common_custom_types_struct_traits.cc
index c18f793b793c701a7b4b21284dda892a0c538142..c3b7ef20008d70f07340134ee17baac57b52b7b3 100644
--- a/mojo/common/common_custom_types_struct_traits.cc
+++ b/mojo/common/common_custom_types_struct_traits.cc
@@ -9,35 +9,25 @@
 namespace mojo {
 
 // static
-mojo::ConstCArray<uint16_t>
-StructTraits<mojo::common::mojom::String16DataView, base::string16>::data(
-    const base::string16& str) {
-  return mojo::ConstCArray<uint16_t>(
-      str.size(), reinterpret_cast<const uint16_t*>(str.data()));
-}
-
-// static
-bool StructTraits<mojo::common::mojom::String16DataView, base::string16>::Read(
-    mojo::common::mojom::String16DataView data,
+bool StructTraits<common::mojom::String16DataView, base::string16>::Read(
+    common::mojom::String16DataView data,
     base::string16* out) {
-  mojo::ArrayDataView<uint16_t> view;
+  ArrayDataView<uint16_t> view;
   data.GetDataDataView(&view);
-  if (view.is_null())
-    return false;
   out->assign(reinterpret_cast<const base::char16*>(view.data()), view.size());
   return true;
 }
 
 // static
 const std::vector<uint32_t>&
-StructTraits<mojo::common::mojom::VersionDataView, base::Version>::components(
+StructTraits<common::mojom::VersionDataView, base::Version>::components(
     const base::Version& version) {
   return version.components();
 }
 
 // static
-bool StructTraits<mojo::common::mojom::VersionDataView, base::Version>::Read(
-    mojo::common::mojom::VersionDataView data,
+bool StructTraits<common::mojom::VersionDataView, base::Version>::Read(
+    common::mojom::VersionDataView data,
     base::Version* out) {
   std::vector<uint32_t> components;
   if (!data.ReadComponents(&components))
@@ -48,10 +38,10 @@ bool StructTraits<mojo::common::mojom::VersionDataView, base::Version>::Read(
 }
 
 // static
-bool StructTraits<mojo::common::mojom::UnguessableTokenDataView,
-                  base::UnguessableToken>::
-    Read(mojo::common::mojom::UnguessableTokenDataView data,
-         base::UnguessableToken* out) {
+bool StructTraits<
+    common::mojom::UnguessableTokenDataView,
+    base::UnguessableToken>::Read(common::mojom::UnguessableTokenDataView data,
+                                  base::UnguessableToken* out) {
   uint64_t high = data.high();
   uint64_t low = data.low();