Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/surfaces/surface_hittest_unittest.cc

Index: cc/surfaces/surface_hittest_unittest.cc
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
index 6f0637f41a485048040e4338c47a78215daafe4d..a144960a135336a5d22d2f5685fbe52e7078ee22 100644
--- a/cc/surfaces/surface_hittest_unittest.cc
+++ b/cc/surfaces/surface_hittest_unittest.cc
@@ -23,7 +23,7 @@ namespace {
 struct TestCase {
   SurfaceId input_surface_id;
   gfx::Point input_point;
-  SurfaceId expected_output_surface_id;
+  SurfaceId expected_compositor_frame_sink_id;
   gfx::Point expected_output_point;
 };
 
@@ -36,7 +36,7 @@ void RunTests(SurfaceHittestDelegate* delegate,
     const TestCase& test = tests[i];
     gfx::Point point(test.input_point);
     gfx::Transform transform;
-    EXPECT_EQ(test.expected_output_surface_id,
+    EXPECT_EQ(test.expected_compositor_frame_sink_id,
               hittest.GetTargetSurfaceAtPoint(test.input_surface_id, point,
                                               &transform));
     transform.TransformPoint(&point);
@@ -46,7 +46,7 @@ void RunTests(SurfaceHittestDelegate* delegate,
     // transform as returned by GetTargetSurfaceAtPoint.
     gfx::Transform target_transform;
     EXPECT_TRUE(hittest.GetTransformToTargetSurface(
-        test.input_surface_id, test.expected_output_surface_id,
+        test.input_surface_id, test.expected_compositor_frame_sink_id,
         &target_transform));
     EXPECT_EQ(transform, target_transform);
   }