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

cc/trees/single_thread_proxy.h

 // Copyright 2011 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.
 
 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_
 #define CC_TREES_SINGLE_THREAD_PROXY_H_
 
 #include <limits>
 
 #include "base/cancelable_callback.h"
@@ skipping 161 matching lines @@
 
   base::WeakPtrFactory<SingleThreadProxy> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy);
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // 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);
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // 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);
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the impl thread and that the main thread is blocked to
 // 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_;
   DebugScopedSetMainThreadBlocked main_thread_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_SINGLE_THREAD_PROXY_H_