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

services/shell/public/cpp/capabilities_struct_traits.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
 #define SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
 
 #include "services/shell/public/cpp/capabilities.h"
 #include "services/shell/public/interfaces/capabilities.mojom.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<shell::mojom::CapabilityRequest, shell::CapabilityRequest> {
+struct StructTraits<shell::mojom::CapabilityRequest::DataView,
+                    shell::CapabilityRequest> {
   static const shell::Classes& classes(
       const shell::CapabilityRequest& request) {
     return request.classes;
   }
   static const shell::Interfaces& interfaces(
       const shell::CapabilityRequest& request) {
     return request.interfaces;
   }
   static bool Read(shell::mojom::CapabilityRequestDataView data,
                    shell::CapabilityRequest* out) {
@@ skipping 12 matching lines @@
       std::string interface;
       if (!interfaces_data_view.Read(i, &interface))
         return false;
       out->interfaces.insert(std::move(interface));
     }
     return true;
   }
 };
 
 template <>
-struct StructTraits<shell::mojom::CapabilitySpec, shell::CapabilitySpec> {
+struct StructTraits<shell::mojom::CapabilitySpec::DataView,
+                    shell::CapabilitySpec> {
   static const std::map<shell::Class, shell::Interfaces>& provided(
       const shell::CapabilitySpec& spec) {
     return spec.provided;
   }
   static const std::map<shell::Name, shell::CapabilityRequest>& required(
       const shell::CapabilitySpec& spec) {
     return spec.required;
   }
   static bool Read(shell::mojom::CapabilitySpecDataView data,
                    shell::CapabilitySpec* out) {
@@ skipping 16 matching lines @@
       out->provided[clazz] = std::move(interfaces);
     }
 
     return data.ReadRequired(&out->required);
   }
 };
 
 }  // namespace mojo
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_