Change TypeConverter<X,Y>::ConvertFrom and ConvertTo into a single symmetric

mojo/services/public/cpp/surfaces/tests/surface_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 "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
@@ skipping 131 matching lines @@
   QuadPtr mojo_texture_quad = Quad::New();
   mojo_texture_quad->material = MATERIAL_TEXTURE_CONTENT;
   TextureQuadStatePtr mojo_texture_state = TextureQuadState::New();
   mojo_texture_state->background_color = Color::New();
   mojo_texture_quad->texture_quad_state = mojo_texture_state.Pass();
   PassPtr mojo_pass = Pass::New();
   mojo_pass->quads.push_back(mojo_texture_quad.Pass());
   SharedQuadStatePtr mojo_sqs = SharedQuadState::New();
   mojo_pass->shared_quad_states.push_back(mojo_sqs.Pass());
 
-  scoped_ptr<cc::RenderPass> pass = ConvertTo(mojo_pass.Pass());
+  scoped_ptr<cc::RenderPass> pass = mojo_pass.To<scoped_ptr<cc::RenderPass> >();
+
   EXPECT_FALSE(pass);
 }
 
 TEST_F(SurfaceLibQuadTest, TextureQuadEmptyBackgroundColor) {
   QuadPtr mojo_texture_quad = Quad::New();
   mojo_texture_quad->material = MATERIAL_TEXTURE_CONTENT;
   TextureQuadStatePtr mojo_texture_state = TextureQuadState::New();
   mojo_texture_state->vertex_opacity = mojo::Array<float>::New(4);
   mojo_texture_quad->texture_quad_state = mojo_texture_state.Pass();
   PassPtr mojo_pass = Pass::New();
   mojo_pass->quads.push_back(mojo_texture_quad.Pass());
   SharedQuadStatePtr mojo_sqs = SharedQuadState::New();
   mojo_pass->shared_quad_states.push_back(mojo_sqs.Pass());
 
-  scoped_ptr<cc::RenderPass> pass = ConvertTo(mojo_pass.Pass());
+  scoped_ptr<cc::RenderPass> pass = mojo_pass.To<scoped_ptr<cc::RenderPass> >();
   EXPECT_FALSE(pass);
 }
 
 TEST(SurfaceLibTest, SharedQuadState) {
   gfx::Transform content_to_target_transform;
   content_to_target_transform.Scale3d(0.3f, 0.7f, 0.9f);
   gfx::Size content_bounds(57, 39);
   gfx::Rect visible_content_rect(3, 7, 28, 42);
   gfx::Rect clip_rect(9, 12, 21, 31);
   bool is_clipped = true;
@@ skipping 106 matching lines @@
   EXPECT_EQ(6, mojo_pass->id);
   EXPECT_EQ(Rect::From(output_rect), mojo_pass->output_rect);
   EXPECT_EQ(Rect::From(damage_rect), mojo_pass->damage_rect);
   EXPECT_EQ(Transform::From(transform_to_root_target),
             mojo_pass->transform_to_root_target);
   EXPECT_EQ(has_transparent_background, mojo_pass->has_transparent_background);
   ASSERT_EQ(1u, mojo_pass->shared_quad_states.size());
   ASSERT_EQ(3u, mojo_pass->quads.size());
   EXPECT_EQ(0, mojo_pass->quads[0]->shared_quad_state_index);
 
-  scoped_ptr<cc::RenderPass> round_trip_pass = ConvertTo(mojo_pass.Pass());
+  scoped_ptr<cc::RenderPass> round_trip_pass =
+      mojo_pass.To<scoped_ptr<cc::RenderPass> >();
   EXPECT_EQ(pass_id, round_trip_pass->id);
   EXPECT_EQ(output_rect, round_trip_pass->output_rect);
   EXPECT_EQ(damage_rect, round_trip_pass->damage_rect);
   EXPECT_EQ(transform_to_root_target,
             round_trip_pass->transform_to_root_target);
   EXPECT_EQ(has_transparent_background,
             round_trip_pass->has_transparent_background);
   ASSERT_EQ(1u, round_trip_pass->shared_quad_state_list.size());
   ASSERT_EQ(3u, round_trip_pass->quad_list.size());
   EXPECT_EQ(round_trip_pass->shared_quad_state_list.front(),
@@ skipping 144 matching lines @@
   cc::ReturnedResource round_trip_resource =
       mojo_resource.To<cc::ReturnedResource>();
   EXPECT_EQ(id, round_trip_resource.id);
   EXPECT_EQ(sync_point, round_trip_resource.sync_point);
   EXPECT_EQ(count, round_trip_resource.count);
   EXPECT_EQ(lost, round_trip_resource.lost);
 }
 
 }  // namespace
 }  // namespace mojo