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

remoting/base/codec_test.cc

Index: remoting/base/codec_test.cc
diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index 0b62a634c3e967c0a548807079139e46832acc73..6754a081318e0c125a5c007da3e09de82a504d09 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -165,14 +165,12 @@ class DecoderTester {
     // Test the content of the update rect.
     ASSERT_EQ(rects_.size(), update_rects_.size());
     for (size_t i = 0; i < update_rects_.size(); ++i) {
-      SkIRect &r = rects_[i];
-      gfx::Rect rect(r.fLeft, r.fTop, r.width(), r.height());
-      EXPECT_EQ(rect, update_rects_[i]);
+      EXPECT_EQ(rects_[i], update_rects_[i]);
 
       EXPECT_EQ(frame_->stride(0), capture_data_->data_planes().strides[0]);
       const int stride = frame_->stride(0);
-      const int offset =  stride * update_rects_[i].y() +
-          kBytesPerPixel * update_rects_[i].x();
+      const int offset =  stride * update_rects_[i].fTop +
+          kBytesPerPixel * update_rects_[i].fLeft;
       const uint8* original = capture_data_->data_planes().data[0] + offset;
       const uint8* decoded = frame_->data(0) + offset;
       const int row_size = kBytesPerPixel * update_rects_[i].width();
@@ -188,7 +186,7 @@ class DecoderTester {
  private:
   bool strict_;
   std::deque<SkIRect> rects_;
-  UpdatedRects update_rects_;
+  RectVector update_rects_;
   Decoder* decoder_;
   scoped_refptr<media::VideoFrame> frame_;
   scoped_refptr<CaptureData> capture_data_;
@@ -257,7 +255,7 @@ scoped_refptr<CaptureData> PrepareEncodeData(media::VideoFrame::Format format,
   planes.strides[0] = kWidth * kBytesPerPixel;
 
   scoped_refptr<CaptureData> data =
-      new CaptureData(planes, gfx::Size(kWidth, kHeight), format);
+      new CaptureData(planes, SkISize::Make(kWidth, kHeight), format);
   return data;
 }