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

BUG=NONE
TEST=BUILD

Review URL: http://codereview.chromium.org/7992011

TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/8103006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103526 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/remoting/base/encoder_vp8_unittest.cc b/remoting/base/encoder_vp8_unittest.cc
index 73fb157..0be53d5 100644
--- a/remoting/base/encoder_vp8_unittest.cc
+++ b/remoting/base/encoder_vp8_unittest.cc
@@ -49,12 +49,12 @@ TEST(EncoderVp8Test, TestSizeChangeNoLeak) {
   planes.strides[0] = width;
 
   scoped_refptr<CaptureData> capture_data(new CaptureData(
-      planes, SkISize::Make(width, height), media::VideoFrame::RGB32));
+      planes, gfx::Size(width, height), media::VideoFrame::RGB32));
   encoder.Encode(capture_data, false,
                  NewCallback(&callback, &EncoderCallback::DataAvailable));
 
   height /= 2;
-  capture_data = new CaptureData(planes, SkISize::Make(width, height),
+  capture_data = new CaptureData(planes, gfx::Size(width, height),
                                  media::VideoFrame::RGB32);
   encoder.Encode(capture_data, false,
                  NewCallback(&callback, &EncoderCallback::DataAvailable));
@@ -62,25 +62,25 @@ TEST(EncoderVp8Test, TestSizeChangeNoLeak) {
 
 TEST(EncoderVp8Test, AlignAndClipRect) {
   // Simple test case (no clipping).
-  SkIRect r1(SkIRect::MakeXYWH(100, 200, 300, 400));
+  gfx::Rect r1(100, 200, 300, 400);
   EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, kIntMax, kIntMax), r1);
 
   // Should expand outward to r1.
-  SkIRect r2(SkIRect::MakeXYWH(101, 201, 298, 398));
+  gfx::Rect r2(101, 201, 298, 398);
   EXPECT_EQ(EncoderVp8::AlignAndClipRect(r2, kIntMax, kIntMax), r1);
 
   // Test clipping to screen size.
   EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, 110, 220),
-            SkIRect::MakeXYWH(100, 200, 10, 20));
+            gfx::Rect(100, 200, 10, 20));
 
   // Rectangle completely off-screen.
-  EXPECT_TRUE(EncoderVp8::AlignAndClipRect(r1, 50, 50).isEmpty());
+  EXPECT_TRUE(EncoderVp8::AlignAndClipRect(r1, 50, 50).IsEmpty());
 
   // Clipping to odd-sized screen.  An unlikely case, and we might not deal
   // with it cleanly in the encoder (we possibly lose 1px at right & bottom
   // of screen).
   EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, 199, 299),
-            SkIRect::MakeXYWH(100, 200, 98, 98));
+            gfx::Rect(100, 200, 98, 98));
 }
 
 }  // namespace remoting