cc: Split Proxy to eliminate unnecessary dependencies on the impl side

cc/layers/video_layer_impl_unittest.cc

Index: cc/layers/video_layer_impl_unittest.cc
diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc
index 28ba58acc2d4c38913002ff8adeec09f89f14bc8..315c863a882e0c6d1f058ed7465ea7515c2cd92d 100644
--- a/cc/layers/video_layer_impl_unittest.cc
+++ b/cc/layers/video_layer_impl_unittest.cc
@@ -21,10 +21,11 @@ namespace {
 // NOTE: We cannot use DebugScopedSetImplThreadAndMainThreadBlocked in these
 // tests because it gets destroyed before the VideoLayerImpl is destroyed. This
 // causes a DCHECK in VideoLayerImpl's destructor to fail.
-static void DebugSetImplThreadAndMainThreadBlocked(Proxy* proxy) {
+static void DebugSetImplThreadAndMainThreadBlocked(
+    ThreadVerifier* thread_verifier) {
 #if DCHECK_IS_ON()
-  proxy->SetCurrentThreadIsImplThread(true);
-  proxy->SetMainThreadBlocked(true);
+  thread_verifier->SetCurrentThreadIsImplThread(true);
+  thread_verifier->SetMainThreadBlocked(true);
 #endif
 }
 
@@ -33,7 +34,7 @@ TEST(VideoLayerImplTest, Occlusion) {
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
       media::PIXEL_FORMAT_YV12, gfx::Size(10, 10), gfx::Rect(10, 10),
@@ -87,7 +88,7 @@ TEST(VideoLayerImplTest, OccludesOtherLayers) {
 
   LayerTestCommon::LayerImplTest impl;
   impl.host_impl()->SetViewportSize(layer_size);
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
   auto active_tree = impl.host_impl()->active_tree();
 
   // Create a video layer with no frame on top of another layer.
@@ -127,7 +128,7 @@ TEST(VideoLayerImplTest, OccludesOtherLayers) {
 
 TEST(VideoLayerImplTest, DidBecomeActiveShouldSetActiveVideoLayer) {
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   FakeVideoFrameProvider provider;
   VideoLayerImpl* video_layer_impl =
@@ -147,7 +148,7 @@ TEST(VideoLayerImplTest, Rotated0) {
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
       media::PIXEL_FORMAT_YV12, gfx::Size(20, 10), gfx::Rect(20, 10),
@@ -183,7 +184,7 @@ TEST(VideoLayerImplTest, Rotated90) {
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
       media::PIXEL_FORMAT_YV12, gfx::Size(20, 10), gfx::Rect(20, 10),
@@ -219,7 +220,7 @@ TEST(VideoLayerImplTest, Rotated180) {
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
       media::PIXEL_FORMAT_YV12, gfx::Size(20, 10), gfx::Rect(20, 10),
@@ -255,7 +256,7 @@ TEST(VideoLayerImplTest, Rotated270) {
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
       media::PIXEL_FORMAT_YV12, gfx::Size(20, 10), gfx::Rect(20, 10),
@@ -294,7 +295,7 @@ TEST(VideoLayerImplTest, SoftwareVideoFrameGeneratesYUVQuad) {
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   gpu::MailboxHolder mailbox_holder;
   mailbox_holder.mailbox.name[0] = 1;
@@ -331,7 +332,7 @@ TEST(VideoLayerImplTest, NativeYUVFrameGeneratesYUVQuad) {
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.thread_verifier());
 
   gpu::MailboxHolder mailbox_holder;
   mailbox_holder.mailbox.name[0] = 1;