Mojo C++ bindings: more consistent Clone() and Equals().

mojo/public/cpp/bindings/tests/equals_unittest.cc

 // 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.
 
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
-#include "mojo/public/cpp/bindings/lib/value_traits.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 
 RectPtr CreateRect() {
   RectPtr r = Rect::New();
@@ skipping 89 matching lines @@
 
   m2.at("foo")->rects.resize(1);
   m2.at("foo")->rects[0]->width = 1;
   EXPECT_FALSE(m1.Equals(m2));
 
   m2 = m1.Clone();
   EXPECT_TRUE(m1.Equals(m2));
 }
 
 TEST_F(EqualsTest, InterfacePtr) {
-  using InterfaceValueTraits = mojo::internal::ValueTraits<SomeInterfacePtr>;
-
   base::MessageLoop message_loop;
 
   SomeInterfacePtr inf1;
   SomeInterfacePtr inf2;
 
-  EXPECT_TRUE(InterfaceValueTraits::Equals(inf1, inf1));
-  EXPECT_TRUE(InterfaceValueTraits::Equals(inf1, inf2));
+  EXPECT_TRUE(inf1.Equals(inf1));
+  EXPECT_TRUE(inf1.Equals(inf2));
 
   auto inf1_request = GetProxy(&inf1);
   ALLOW_UNUSED_LOCAL(inf1_request);
 
-  EXPECT_TRUE(InterfaceValueTraits::Equals(inf1, inf1));
-  EXPECT_FALSE(InterfaceValueTraits::Equals(inf1, inf2));
+  EXPECT_TRUE(inf1.Equals(inf1));
+  EXPECT_FALSE(inf1.Equals(inf2));
 
   auto inf2_request = GetProxy(&inf2);
   ALLOW_UNUSED_LOCAL(inf2_request);
 
-  EXPECT_FALSE(InterfaceValueTraits::Equals(inf1, inf2));
+  EXPECT_FALSE(inf1.Equals(inf2));
 }
 
 TEST_F(EqualsTest, InterfaceRequest) {
-  using RequestValueTraits =
-      mojo::internal::ValueTraits<InterfaceRequest<SomeInterface>>;
-
   base::MessageLoop message_loop;
 
   InterfaceRequest<SomeInterface> req1;
   InterfaceRequest<SomeInterface> req2;
 
-  EXPECT_TRUE(RequestValueTraits::Equals(req1, req1));
-  EXPECT_TRUE(RequestValueTraits::Equals(req1, req2));
+  EXPECT_TRUE(req1.Equals(req1));
+  EXPECT_TRUE(req1.Equals(req2));
 
   SomeInterfacePtr inf1;
   req1 = GetProxy(&inf1);
 
-  EXPECT_TRUE(RequestValueTraits::Equals(req1, req1));
-  EXPECT_FALSE(RequestValueTraits::Equals(req1, req2));
+  EXPECT_TRUE(req1.Equals(req1));
+  EXPECT_FALSE(req1.Equals(req2));
 
   SomeInterfacePtr inf2;
   req2 = GetProxy(&inf2);
 
-  EXPECT_FALSE(RequestValueTraits::Equals(req1, req2));
+  EXPECT_FALSE(req1.Equals(req2));
 }
 
 }  // test
 }  // mojo