Mojo C++ bindings: change the first template parameter of StructTraits and UnionTraits.

cc/ipc/surface_id_struct_traits.h

Index: cc/ipc/surface_id_struct_traits.h
diff --git a/cc/ipc/surface_id_struct_traits.h b/cc/ipc/surface_id_struct_traits.h
index 162b39804ed9b2270bf12df278b20868f0fe0c9c..03ae6156092eb74de2a37d666352c7faa9b41094 100644
--- a/cc/ipc/surface_id_struct_traits.h
+++ b/cc/ipc/surface_id_struct_traits.h
@@ -9,9 +9,9 @@
 
 namespace mojo {
 
-// This template is fully specialized as cc::mojom::SurfaceId and
-// as cc::mojom::blink::SurfaceId, in generated .mojom.h and .mojom-blink.h
-// respectively.
+// This template is fully specialized as cc::mojom::SurfaceIdDataView and
+// as cc::mojom::blink::SurfaceIdDataView, in generated .mojom.h and
+// .mojom-blink.h respectively.
 template <typename T>
 struct StructTraits<T, cc::SurfaceId> {
   static uint32_t client_id(const cc::SurfaceId& id) { return id.client_id(); }
@@ -20,7 +20,7 @@ struct StructTraits<T, cc::SurfaceId> {
 
   static uint64_t nonce(const cc::SurfaceId& id) { return id.nonce(); }
 
-  static bool Read(typename T::DataView data, cc::SurfaceId* out) {
+  static bool Read(T data, cc::SurfaceId* out) {
     *out = cc::SurfaceId(data.client_id(), data.local_id(), data.nonce());
     return true;
   }