Change mojo geometry structs from using type converters to StructTraits.

media/mojo/services/media_mojo_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
  public:
   MockRendererClient() {}
   ~MockRendererClient() override {}
 
   // mojom::RendererClient implementation.
   MOCK_METHOD2(OnTimeUpdate, void(int64_t time_usec, int64_t max_time_usec));
   MOCK_METHOD1(OnBufferingStateChange, void(mojom::BufferingState state));
   MOCK_METHOD0(OnEnded, void());
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD1(OnVideoOpacityChange, void(bool opaque));
-
-  // TODO(alokp): gmock does not support move-only function arguments.
-  // Convert this into MOCK_METHOD after gmock implements this feature.
-  // https://github.com/google/googletest/issues/395
-  // If we need to use this mock method before the gmock bug gets fixed, we
-  // would need to define a MOCK_METHOD using non movable type which calls this.
-  void OnVideoNaturalSizeChange(mojo::SizePtr size) override {}
+  MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size& size));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
 };
 
 class MediaShellTest : public shell::test::ShellTest {
  public:
   MediaShellTest()
       : ShellTest("exe:media_mojo_unittests"),
         renderer_client_binding_(&renderer_client_),
@@ skipping 119 matching lines @@
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   service_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media