C++ Bindings: Remove 'inline' arg from generated union serialization functions.

mojo/public/cpp/bindings/lib/map_serialization.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_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 
 #include <type_traits>
 
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
@@ skipping 57 matching lines @@
     return count * sizeof(StructPointer<S_Data>);
   }
   static size_t GetItemSize(const S& item) {
     return item ? GetSerializedSize_(*UnwrapConstStructPtr<S>::value(item)) : 0;
   }
 };
 
 template <typename U, typename U_Data>
 struct MapSerializer<U, U_Data, true, true> {
   static size_t GetBaseArraySize(size_t count) {
-    return count * sizeof(U_Data);
+    // GetSerializedSize_ (called in GetItemSize()) will account for
+    // sizeof(U_Data), so prevent double counting by having this count be 0.
+    return 0;
   }
-  static size_t GetItemSize(const U& item) {
-    return GetSerializedSize_(item, true);
-  }
+  static size_t GetItemSize(const U& item) { return GetSerializedSize_(item); }
 };
 
 template <>
 struct MapSerializer<String, String_Data*, false, false> {
   static size_t GetBaseArraySize(size_t count) {
     return count * sizeof(StringPointer);
   }
   static size_t GetItemSize(const String& item) {
     return GetSerializedSize_(item);
   }
@@ skipping 110 matching lines @@
 
     *output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());
   } else {
     output->reset();
   }
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_