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

mojo/public/cpp/bindings/lib/bindings_internal.cc

Index: mojo/public/cpp/bindings/lib/bindings_internal.cc
diff --git a/mojo/public/cpp/bindings/lib/serialization_util.cc b/mojo/public/cpp/bindings/lib/bindings_internal.cc
similarity index 77%
rename from mojo/public/cpp/bindings/lib/serialization_util.cc
rename to mojo/public/cpp/bindings/lib/bindings_internal.cc
index d672243b7794c907a78757166b6a6b0c8a08ff64..a3bdb1fe98d5e7a8a5160868213e82d89f292040 100644
--- a/mojo/public/cpp/bindings/lib/serialization_util.cc
+++ b/mojo/public/cpp/bindings/lib/bindings_internal.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "mojo/public/cpp/bindings/lib/serialization_util.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 
 namespace mojo {
 namespace internal {
@@ -43,11 +43,5 @@ void EncodePointer(const void* ptr, uint64_t* offset) {
   *offset = static_cast<uint64_t>(p_obj - p_slot);
 }
 
-const void* DecodePointerRaw(const uint64_t* offset) {
-  if (!*offset)
-    return nullptr;
-  return reinterpret_cast<const char*>(offset) + *offset;
-}
-
 }  // namespace internal
 }  // namespace mojo