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

cc/trees/single_thread_proxy.h

Index: cc/trees/single_thread_proxy.h
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 4ce4ab34fa5b7cd8c4fc72c8d54dee8ec710dcf1..5cf590a27258a89b7f58a3ff3c35348a98700912 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -179,21 +179,22 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
 // code is running on the impl thread to satisfy assertion checks.
 class DebugScopedSetImplThread {
  public:
-  explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) {
+  explicit DebugScopedSetImplThread(ThreadVerifier* thread_verifier)
+      : thread_verifier_(thread_verifier) {
 #if DCHECK_IS_ON()
-    previous_value_ = proxy_->impl_thread_is_overridden_;
-    proxy_->SetCurrentThreadIsImplThread(true);
+    previous_value_ = thread_verifier_->impl_thread_is_overridden_;
+    thread_verifier_->SetCurrentThreadIsImplThread(true);
 #endif
   }
   ~DebugScopedSetImplThread() {
 #if DCHECK_IS_ON()
-    proxy_->SetCurrentThreadIsImplThread(previous_value_);
+    thread_verifier_->SetCurrentThreadIsImplThread(previous_value_);
 #endif
   }
 
  private:
   bool previous_value_;
-  Proxy* proxy_;
+  ThreadVerifier* thread_verifier_;
 
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThread);
 };
@@ -202,21 +203,22 @@ class DebugScopedSetImplThread {
 // code is running on the main thread to satisfy assertion checks.
 class DebugScopedSetMainThread {
  public:
-  explicit DebugScopedSetMainThread(Proxy* proxy) : proxy_(proxy) {
+  explicit DebugScopedSetMainThread(ThreadVerifier* thread_verifier)
+      : thread_verifier_(thread_verifier) {
 #if DCHECK_IS_ON()
-    previous_value_ = proxy_->impl_thread_is_overridden_;
-    proxy_->SetCurrentThreadIsImplThread(false);
+    previous_value_ = thread_verifier_->impl_thread_is_overridden_;
+    thread_verifier_->SetCurrentThreadIsImplThread(false);
 #endif
   }
   ~DebugScopedSetMainThread() {
 #if DCHECK_IS_ON()
-    proxy_->SetCurrentThreadIsImplThread(previous_value_);
+    thread_verifier_->SetCurrentThreadIsImplThread(previous_value_);
 #endif
   }
 
  private:
   bool previous_value_;
-  Proxy* proxy_;
+  ThreadVerifier* thread_verifier_;
 
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThread);
 };
@@ -226,8 +228,9 @@ class DebugScopedSetMainThread {
 // satisfy assertion checks
 class DebugScopedSetImplThreadAndMainThreadBlocked {
  public:
-  explicit DebugScopedSetImplThreadAndMainThreadBlocked(Proxy* proxy)
-      : impl_thread_(proxy), main_thread_blocked_(proxy) {}
+  explicit DebugScopedSetImplThreadAndMainThreadBlocked(
+      ThreadVerifier* thread_verifier)
+      : impl_thread_(thread_verifier), main_thread_blocked_(thread_verifier) {}
 
  private:
   DebugScopedSetImplThread impl_thread_;