cc: Remove things from OutputSurface and CompositorFrameSink.

cc/trees/layer_tree_host_unittest_copyrequest.cc

 // Copyright 2013 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 "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 1226 matching lines @@
       case 1:
         // Only the root layer draws, the child is hidden.
         EXPECT_TRUE(saw_root);
         EXPECT_FALSE(saw_child);
         break;
       case 2:
         // Copy happening here, the child will draw.
         EXPECT_TRUE(saw_root);
         EXPECT_TRUE(saw_child);
         // Make another draw happen after doing the copy request.
-        host_impl->SetNeedsRedrawRect(gfx::Rect(1, 1));
+        host_impl->SetViewportDamage(gfx::Rect(1, 1));
+        host_impl->SetNeedsRedraw();
         break;
       case 3:
         // If LayerTreeHostImpl does the wrong thing, it will try to draw the
         // layer which had a copy request. But only the root should draw.
         EXPECT_TRUE(saw_root);
         EXPECT_FALSE(saw_child);
 
         // End the test! Don't race with copy request callbacks, so post the end
         // to the main thread.
         draw_happened_ = true;
@@ skipping 26 matching lines @@
   int num_draws_;
   bool copy_happened_;
   bool draw_happened_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest);
 
 }  // namespace
 }  // namespace cc