Add extra_data_field_ in gpu::SyncToken converter and remove two array converters

mojo/converters/surfaces/surfaces_type_converters.h

 // Copyright 2014 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 MOJO_CONVERTERS_SURFACES_SURFACES_TYPE_CONVERTERS_H_
 #define MOJO_CONVERTERS_SURFACES_SURFACES_TYPE_CONVERTERS_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/transferable_resource.h"
@@ skipping 124 matching lines @@
 };
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<cc::TransferableResource,
                                           mus::mojom::TransferableResourcePtr> {
   static cc::TransferableResource Convert(
       const mus::mojom::TransferableResourcePtr& input);
 };
 
 template <>
 struct MOJO_SURFACES_EXPORT
-    TypeConverter<Array<mus::mojom::TransferableResourcePtr>,
-                  cc::TransferableResourceArray> {
-  static Array<mus::mojom::TransferableResourcePtr> Convert(
-      const cc::TransferableResourceArray& input);
-};
-template <>
-struct MOJO_SURFACES_EXPORT
-    TypeConverter<cc::TransferableResourceArray,
-                  Array<mus::mojom::TransferableResourcePtr>> {
-  static cc::TransferableResourceArray Convert(
-      const Array<mus::mojom::TransferableResourcePtr>& input);
-};
-
-template <>
-struct MOJO_SURFACES_EXPORT
     TypeConverter<mus::mojom::ReturnedResourcePtr, cc::ReturnedResource> {
   static mus::mojom::ReturnedResourcePtr Convert(
       const cc::ReturnedResource& input);
 };
 template <>
 struct MOJO_SURFACES_EXPORT
     TypeConverter<cc::ReturnedResource, mus::mojom::ReturnedResourcePtr> {
   static cc::ReturnedResource Convert(
       const mus::mojom::ReturnedResourcePtr& input);
 };
 
 template <>
 struct MOJO_SURFACES_EXPORT
-    TypeConverter<Array<mus::mojom::ReturnedResourcePtr>,
-                  cc::ReturnedResourceArray> {
-  static Array<mus::mojom::ReturnedResourcePtr> Convert(
-      const cc::ReturnedResourceArray& input);
-};
-template <>
-struct MOJO_SURFACES_EXPORT
-    TypeConverter<cc::ReturnedResourceArray,
-                  Array<mus::mojom::ReturnedResourcePtr>> {
-  static cc::ReturnedResourceArray Convert(
-      const Array<mus::mojom::ReturnedResourcePtr>& input);
-};
-
-template <>
-struct MOJO_SURFACES_EXPORT
     TypeConverter<mus::mojom::CompositorFrameMetadataPtr,
                   cc::CompositorFrameMetadata> {
   static mus::mojom::CompositorFrameMetadataPtr Convert(
       const cc::CompositorFrameMetadata& input);
 };
 template <>
 struct MOJO_SURFACES_EXPORT
     TypeConverter<cc::CompositorFrameMetadata,
                   mus::mojom::CompositorFrameMetadataPtr> {
   static cc::CompositorFrameMetadata Convert(
@@ skipping 14 matching lines @@
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<scoped_ptr<cc::CompositorFrame>,
                                           mus::mojom::CompositorFramePtr> {
   static scoped_ptr<cc::CompositorFrame> Convert(
       const mus::mojom::CompositorFramePtr& input);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_CONVERTERS_SURFACES_SURFACES_TYPE_CONVERTERS_H_