Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

mojo/ui/gl_renderer_unittest.cc

Index: mojo/ui/gl_renderer_unittest.cc
diff --git a/mojo/ui/gl_renderer_unittest.cc b/mojo/ui/gl_renderer_unittest.cc
index 82c31916efbde382c45b84dd0fe4bc8d6f90e495..8e58f60c31336960a79a8356d9761c25847ac197 100644
--- a/mojo/ui/gl_renderer_unittest.cc
+++ b/mojo/ui/gl_renderer_unittest.cc
@@ -13,6 +13,8 @@
 #include "mojo/ui/gl_renderer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using mojo::gfx::composition::MailboxTextureCallbackPtr;
+
 namespace {
 
 static const base::TimeDelta kDefaultMessageDelay =
@@ -61,12 +63,13 @@ TEST_F(GLRendererTest, GetTextureOnce) {
 
   mojo::gfx::composition::ResourcePtr resource =
       renderer.BindTextureResource(std::move(texture));
+

[viettrungluu, 2016/02/11 18:26:29]

nit: probably don't add this blank line

[vardhan, 2016/02/11 22:47:53]

Done.

   EXPECT_NE(resource.get(), nullptr);
   EXPECT_NE(resource->get_mailbox_texture().get(), nullptr);
   EXPECT_FALSE(resource->get_mailbox_texture()->mailbox_name.is_null());
   EXPECT_TRUE(resource->get_mailbox_texture()->size->Equals(size));
   EXPECT_NE(resource->get_mailbox_texture()->sync_point, 0u);
-  EXPECT_NE(resource->get_mailbox_texture()->callback.get(), nullptr);
+  EXPECT_TRUE(resource->get_mailbox_texture()->callback.is_valid());
 }
 
 TEST_F(GLRendererTest, GetTextureTwiceSameSize) {
@@ -91,7 +94,7 @@ TEST_F(GLRendererTest, GetTextureTwiceSameSize) {
   EXPECT_FALSE(resource1->get_mailbox_texture()->mailbox_name.is_null());
   EXPECT_TRUE(resource1->get_mailbox_texture()->size->Equals(size));
   EXPECT_NE(resource1->get_mailbox_texture()->sync_point, 0u);
-  EXPECT_NE(resource1->get_mailbox_texture()->callback.get(), nullptr);
+  EXPECT_TRUE(resource1->get_mailbox_texture()->callback.is_valid());
 
   mojo::gfx::composition::ResourcePtr resource2 =
       renderer.BindTextureResource(std::move(texture2));
@@ -100,7 +103,7 @@ TEST_F(GLRendererTest, GetTextureTwiceSameSize) {
   EXPECT_FALSE(resource2->get_mailbox_texture()->mailbox_name.is_null());
   EXPECT_TRUE(resource2->get_mailbox_texture()->size->Equals(size));
   EXPECT_NE(resource2->get_mailbox_texture()->sync_point, 0u);
-  EXPECT_NE(resource2->get_mailbox_texture()->callback.get(), nullptr);
+  EXPECT_TRUE(resource2->get_mailbox_texture()->callback.is_valid());
 
   EXPECT_NE(resource2->get_mailbox_texture()->sync_point,
             resource1->get_mailbox_texture()->sync_point);
@@ -120,7 +123,9 @@ TEST_F(GLRendererTest, GetTextureAfterRecycleSameSize) {
   mojo::gfx::composition::ResourcePtr resource1 =
       renderer.BindTextureResource(std::move(texture1));
   EXPECT_NE(resource1.get(), nullptr);
-  resource1->get_mailbox_texture()->callback->OnMailboxTextureReleased();
+  MailboxTextureCallbackPtr::Create(
+      std::move(resource1->get_mailbox_texture()->callback))
+      ->OnMailboxTextureReleased();
 
   KickMessageLoop();
 
@@ -142,7 +147,9 @@ TEST_F(GLRendererTest, GetTextureAfterRecycleDifferentSize) {
   mojo::gfx::composition::ResourcePtr resource1 =
       renderer.BindTextureResource(std::move(texture1));
   EXPECT_NE(resource1.get(), nullptr);
-  resource1->get_mailbox_texture()->callback->OnMailboxTextureReleased();
+  MailboxTextureCallbackPtr::Create(
+      std::move(resource1->get_mailbox_texture()->callback))
+      ->OnMailboxTextureReleased();
 
   KickMessageLoop();
 
@@ -198,7 +205,9 @@ TEST_F(GLRendererTest, RecycledAfterReleasedGlContext) {
   EXPECT_NE(resource1.get(), nullptr);
 
   gl_context_->Destroy();
-  resource1->get_mailbox_texture()->callback->OnMailboxTextureReleased();
+  MailboxTextureCallbackPtr::Create(
+      std::move(resource1->get_mailbox_texture()->callback))
+      ->OnMailboxTextureReleased();
 
   KickMessageLoop();