Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/surfaces/surface_hittest_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_hittest.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/surface_hittest_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 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;
 };
 
 void RunTests(SurfaceHittestDelegate* delegate,
               SurfaceManager* manager,
               TestCase* tests,
               size_t test_count) {
   SurfaceHittest hittest(delegate, manager);
   for (size_t i = 0; i < test_count; ++i) {
     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);
     EXPECT_EQ(test.expected_output_point, point);
 
     // Verify that GetTransformToTargetSurface returns true and returns the same
     // 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);
   }
 }
 
 }  // namespace
 
 using namespace test;
 
 // This test verifies that hit testing on a surface that does not exist does
@@ skipping 521 matching lines @@
            arraysize(test_expectations_with_accept_insets));
 
   // Verify that insets have affected hit targeting.
   EXPECT_EQ(0, accept_delegate.reject_target_overrides());
   EXPECT_EQ(2, accept_delegate.accept_target_overrides());
 
   factory.Destroy(root_surface_id);
 }
 
 }  // namespace cc