Move us fully from gfx:: over to skia types for consistency.

remoting/host/screen_recorder_unittest.cc

 // Copyright (c) 2011 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 "remoting/host/screen_recorder.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "remoting/base/base_mock_objects.h"
@@ skipping 94 matching lines @@
 
 // This test mocks capturer, encoder and network layer to operate one recording
 // cycle.
 TEST_F(ScreenRecorderTest, OneRecordCycle) {
   SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
-  gfx::Size size(kWidth, kHeight);
+  SkISize size(SkISize::Make(kWidth, kHeight));
   scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
   EXPECT_CALL(capturer_, InvalidateFullScreen());
 
   // First the capturer is called.
   EXPECT_CALL(capturer_, CaptureInvalidRegion(NotNull()))
       .WillOnce(RunCallback(update_region, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode());
@@ skipping 28 matching lines @@
 // ScreenRecorder is instructed to come to a complete stop. We expect the stop
 // sequence to be executed successfully.
 TEST_F(ScreenRecorderTest, StartAndStop) {
   SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
 
-  gfx::Size size(kWidth, kHeight);
+  SkISize size(SkISize::Make(kWidth, kHeight));
   scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
   EXPECT_CALL(capturer_, InvalidateFullScreen());
 
   // First the capturer is called.
   EXPECT_CALL(capturer_, CaptureInvalidRegion(NotNull()))
       .WillRepeatedly(RunCallback(update_region, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillRepeatedly(FinishEncode());
@@ skipping 22 matching lines @@
   record_->Start();
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   record_->Stop(base::Bind(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting