Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively.

mojo/mojo_public.gypi

 # 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.
 
 {
   'variables': {
     'mojo_cpp_bindings_sources': [
       'public/cpp/bindings/array.h',
       'public/cpp/bindings/array_traits.h',
       'public/cpp/bindings/array_traits_carray.h',
@@ skipping 15 matching lines @@
       'public/cpp/bindings/interface_ptr.h',
       'public/cpp/bindings/interface_ptr_set.h',
       'public/cpp/bindings/interface_request.h',
       'public/cpp/bindings/lib/array_internal.cc',
       'public/cpp/bindings/lib/array_internal.h',
       'public/cpp/bindings/lib/array_serialization.h',
       'public/cpp/bindings/lib/associated_group.cc',
       'public/cpp/bindings/lib/associated_group_controller.cc',
       'public/cpp/bindings/lib/associated_interface_ptr_state.h',
       'public/cpp/bindings/lib/binding_state.h',
+      'public/cpp/bindings/lib/bindings_internal.cc',
       'public/cpp/bindings/lib/bindings_internal.h',
       'public/cpp/bindings/lib/buffer.h',
       'public/cpp/bindings/lib/connector.cc',
       'public/cpp/bindings/lib/control_message_handler.cc',
       'public/cpp/bindings/lib/control_message_handler.h',
       'public/cpp/bindings/lib/control_message_proxy.cc',
       'public/cpp/bindings/lib/control_message_proxy.h',
       'public/cpp/bindings/lib/filter_chain.cc',
       'public/cpp/bindings/lib/filter_chain.h',
       'public/cpp/bindings/lib/fixed_buffer.cc',
@@ skipping 24 matching lines @@
       'public/cpp/bindings/lib/pipe_control_message_handler.cc',
       'public/cpp/bindings/lib/pipe_control_message_proxy.cc',
       'public/cpp/bindings/lib/router.cc',
       'public/cpp/bindings/lib/router.h',
       'public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc',
       'public/cpp/bindings/lib/serialization.h',
       'public/cpp/bindings/lib/serialization_context.cc',
       'public/cpp/bindings/lib/serialization_context.h',
       'public/cpp/bindings/lib/serialization_forward.h',
       'public/cpp/bindings/lib/serialization_forward.h',
-      'public/cpp/bindings/lib/serialization_util.cc',
       'public/cpp/bindings/lib/serialization_util.h',
       'public/cpp/bindings/lib/string_serialization.h',
       'public/cpp/bindings/lib/string_traits_string16.cc',
       'public/cpp/bindings/lib/sync_call_restrictions.cc',
       'public/cpp/bindings/lib/sync_handle_registry.cc',
       'public/cpp/bindings/lib/sync_handle_watcher.cc',
       'public/cpp/bindings/lib/template_util.h',
       'public/cpp/bindings/lib/validate_params.h',
       'public/cpp/bindings/lib/validation_context.cc',
       'public/cpp/bindings/lib/validation_context.h',
@@ skipping 52 matching lines @@
       'public/c/system/message_pipe.h',
       'public/c/system/platform_handle.h',
       'public/c/system/system_export.h',
       'public/c/system/thunks.cc',
       'public/c/system/thunks.h',
       'public/c/system/types.h',
       'public/c/system/wait_set.h',
     ],
   },
 }