Make the file chooser use PP_ArrayOutput

ppapi/cpp/output_traits.h

 // Copyright (c) 2012 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 PPAPI_CPP_OUTPUT_TRAITS_H_
 #define PPAPI_CPP_OUTPUT_TRAITS_H_
 
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/cpp/array_output.h"
 
@@ skipping 131 matching lines @@
 // Array output parameters -----------------------------------------------------
 
 // Output traits for vectors of all "plain old data" (POD) types. It is
 // implemented to pass a pointer to the browser as an output parameter.
 //
 // This is used as a base class for the general vector CallbackOutputTraits
 // below in the case where T is not a resource.
 template<typename T>
 struct GenericVectorCallbackOutputTraits {
   // All arrays are output via a PP_ArrayOutput type.
-  typedef PP_ArrayOutput* APIArgType;
+  typedef PP_ArrayOutput APIArgType;
 
   // We store the array as this adapter which combines the PP_ArrayOutput
   // structure with the underlying std::vector that it will write into.
   typedef ArrayOutputAdapterWithStorage<T> StorageType;
 
   // Retrieves the PP_ArrayOutput interface for our vector object that the
   // browser will use to write into our code.
   static inline APIArgType StorageToAPIArg(StorageType& t) {
     return t.pp_array_output();
   }
 
   // Retrieves the underlying vector that can be passed to the plugin.
   static inline std::vector<T>& StorageToPluginArg(StorageType& t) {
     return t.output();
   }
 };
 
 // Output traits for all vectors of resource types. It is implemented to pass
 // a PP_Resource* as an output parameter to the browser, and convert to the
 // given resource object type T when passing to the plugin.
 //
 // Note that this class is parameterized by the resource object, for example
 // ResourceVectorCallbackOutputTraits<pp::FileRef>. This is used as a base
 // class for CallbackOutputTraits below for the case where T is a derived
 // class of pp::Resource.
 template<typename T>
 struct ResourceVectorCallbackOutputTraits {
-  typedef PP_ArrayOutput* APIArgType;
+  typedef PP_ArrayOutput APIArgType;
   typedef ResourceArrayOutputAdapterWithStorage<T> StorageType;
 
   static inline APIArgType StorageToAPIArg(StorageType& t) {
     return t.pp_array_output();
   }
   static inline std::vector<T>& StorageToPluginArg(StorageType& t) {
     return t.output();
   }
 };
 
 // Specialization of CallbackOutputTraits for vectors. This struct covers both
 // arrays of resources and arrays of POD (ints, structs, etc.) by inheriting
 // from the appropriate base class depending on whether the given type derives
 // from pp::Resource. This trick allows us to do this once rather than writing
 // specilalizations for every resource object type.
 template<typename T>
 struct CallbackOutputTraits< std::vector<T> >
     : public InheritIf<GenericVectorCallbackOutputTraits<T>,
                        !IsBaseOf<Resource, T>::value>,
       public InheritIf<ResourceVectorCallbackOutputTraits<T>,
                        IsBaseOf<Resource, T>::value> {
 };
 
 // A specialization of CallbackOutputTraits to provide the callback system
 // the information on how to handle vectors of pp::Var. Vectors of resources
 // and plain data are handled separately. See the above definition for more.
 template<>
 struct CallbackOutputTraits< std::vector<pp::Var> > {
   // All arrays are output via a PP_ArrayOutput type.
-  typedef PP_ArrayOutput* APIArgType;
+  typedef PP_ArrayOutput APIArgType;
 
   // We store the array as this adapter which combines the PP_ArrayOutput
   // structure with the underlying std::vector that it will write into.
   typedef VarArrayOutputAdapterWithStorage StorageType;
 
   // Retrieves the PP_ArrayOutput interface for our vector object that the
   // browser will use to write into our code.
   static inline APIArgType StorageToAPIArg(StorageType& t) {
     return t.pp_array_output();
   }
 
   // Retrieves the underlying vector that can be passed to the plugin.
   static inline std::vector<pp::Var>& StorageToPluginArg(StorageType& t) {
     return t.output();
   }
 };
 
 }  // namespace internal
 }  // namespace pp
 
 #endif  // PPAPI_CPP_OUTPUT_TRAITS_H_