Revert of Make cc output surface creation async

cc/test/fake_layer_tree_host_client.h

Index: cc/test/fake_layer_tree_host_client.h
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index bfbd1ef08fc4c2ba7d86a83b807fbcf222c35a21..0082a33fc52be78d5833c0e5b4ddad5768ea4c49 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -26,9 +26,6 @@
   explicit FakeLayerTreeHostClient(RendererOptions options);
   virtual ~FakeLayerTreeHostClient();
 
-  // Caller responsible for unsetting this and maintaining the host's lifetime.
-  void SetLayerTreeHost(LayerTreeHost* host) { host_ = host; }
-
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
   virtual void DidBeginMainFrame() OVERRIDE {}
@@ -38,7 +35,7 @@
                                    float page_scale,
                                    float top_controls_delta) OVERRIDE {}
 
-  virtual void RequestNewOutputSurface(bool fallback) OVERRIDE;
+  virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) OVERRIDE;
   virtual void DidInitializeOutputSurface() OVERRIDE {}
   virtual void WillCommit() OVERRIDE {}
   virtual void DidCommit() OVERRIDE {}
@@ -52,8 +49,6 @@
  private:
   bool use_software_rendering_;
   bool use_delegating_renderer_;
-
-  LayerTreeHost* host_;
 };
 
 }  // namespace cc