Revert "Shouldn't access LayerTreeTest::layer_tree_host on impl thread"

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index bd20fa8250535be731a8ffcc1e4a2d6a9f61d33f..7fe1f565106808b68952ba9866a608188f381b81 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -97,7 +97,7 @@ void SingleThreadProxy::SetLayerTreeHostClientReady() {
 }
 
 void SingleThreadProxy::SetVisible(bool visible) {
-  DebugScopedSetImplThreadAndMainThreadBlocked impl(this);
+  DebugScopedSetImplThread impl(this);
   layer_tree_host_impl_->SetVisible(visible);
 }
 
@@ -176,7 +176,9 @@ void SingleThreadProxy::DoCommit(scoped_ptr<ResourceUpdateQueue> queue) {
   DCHECK(Proxy::IsMainThread());
   // Commit immediately.
   {
-    DebugScopedSetImplThreadAndMainThreadBlocked impl_with_main_blocked(this);
+    DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
+    DebugScopedSetImplThread impl(this);
+
     RenderingStatsInstrumentation* stats_instrumentation =
         layer_tree_host_->rendering_stats_instrumentation();
     base::TimeTicks start_time = stats_instrumentation->StartRecording();