Revert 224101 "Remove dependency on Skia from chromoting client."

trunk/src/remoting/protocol/mouse_input_filter_unittest.cc

Index: trunk/src/remoting/protocol/mouse_input_filter_unittest.cc
===================================================================
--- trunk/src/remoting/protocol/mouse_input_filter_unittest.cc	(revision 224204)
+++ trunk/src/remoting/protocol/mouse_input_filter_unittest.cc	(working copy)
@@ -8,7 +8,7 @@
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "third_party/skia/include/core/SkPoint.h"
 
 using ::testing::_;
 using ::testing::InSequence;
@@ -28,22 +28,16 @@
 }
 
 static void InjectTestSequence(InputStub* input_stub) {
-  struct Point {
-    int x;
-    int y;
-  };
-  static const Point input_sequence[] = {
+  static const SkIPoint input_sequence[] = {
     {-5, 10}, {0, 10}, {-1, 10}, {15, 40}, {15, 45}, {15, 39}, {15, 25}
   };
-  // arraysize() cannot be used here, becase Point is declared inside of a
-  // function.
-  for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) {
-    const Point& point = input_sequence[i];
-    input_stub->InjectMouseEvent(MouseMoveEvent(point.x, point.y));
+  for (unsigned int i=0; i<arraysize(input_sequence); ++i) {
+    const SkIPoint& point = input_sequence[i];
+    input_stub->InjectMouseEvent(MouseMoveEvent(point.x(), point.y()));
   }
-  for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) {
-    const Point& point = input_sequence[i];
-    input_stub->InjectMouseEvent(MouseMoveEvent(point.y, point.x));
+  for (unsigned int i=0; i<arraysize(input_sequence); ++i) {
+    const SkIPoint& point = input_sequence[i];
+    input_stub->InjectMouseEvent(MouseMoveEvent(point.y(), point.x()));
   }
 }
 
@@ -62,7 +56,7 @@
 TEST(MouseInputFilterTest, InputDimensionsZero) {
   MockInputStub mock_stub;
   MouseInputFilter mouse_filter(&mock_stub);
-  mouse_filter.set_output_size(webrtc::DesktopSize(50, 50));
+  mouse_filter.set_output_size(SkISize::Make(50,50));
 
   EXPECT_CALL(mock_stub, InjectMouseEvent(_))
       .Times(0);
@@ -74,7 +68,7 @@
 TEST(MouseInputFilterTest, OutputDimensionsZero) {
   MockInputStub mock_stub;
   MouseInputFilter mouse_filter(&mock_stub);
-  mouse_filter.set_input_size(webrtc::DesktopSize(50, 50));
+  mouse_filter.set_input_size(SkISize::Make(50,50));
 
   EXPECT_CALL(mock_stub, InjectMouseEvent(_))
       .Times(0);
@@ -86,8 +80,8 @@
 TEST(MouseInputFilterTest, NoScalingOrClipping) {
   MockInputStub mock_stub;
   MouseInputFilter mouse_filter(&mock_stub);
-  mouse_filter.set_output_size(webrtc::DesktopSize(40,40));
-  mouse_filter.set_input_size(webrtc::DesktopSize(40,40));
+  mouse_filter.set_output_size(SkISize::Make(40,40));
+  mouse_filter.set_input_size(SkISize::Make(40,40));
 
   {
     InSequence s;
@@ -114,8 +108,8 @@
 TEST(MouseInputFilterTest, UpScalingAndClamping) {
   MockInputStub mock_stub;
   MouseInputFilter mouse_filter(&mock_stub);
-  mouse_filter.set_output_size(webrtc::DesktopSize(80, 80));
-  mouse_filter.set_input_size(webrtc::DesktopSize(40, 40));
+  mouse_filter.set_output_size(SkISize::Make(80,80));
+  mouse_filter.set_input_size(SkISize::Make(40,40));
 
   {
     InSequence s;
@@ -142,8 +136,8 @@
 TEST(MouseInputFilterTest, DownScalingAndClamping) {
   MockInputStub mock_stub;
   MouseInputFilter mouse_filter(&mock_stub);
-  mouse_filter.set_output_size(webrtc::DesktopSize(30, 30));
-  mouse_filter.set_input_size(webrtc::DesktopSize(40, 40));
+  mouse_filter.set_output_size(SkISize::Make(30,30));
+  mouse_filter.set_input_size(SkISize::Make(40,40));
 
   {
     InSequence s;