Merge cc initialization paths

Code path between first initialization and recreate on context
lost are merged. Do this by changing the first initialization
behavior to match recreate. Now both are kicked off by the
scheduler and blocks the main thread on the impl thread.

The scheduler is started in output surface lost state and
immediately schedules recreation. This means the first
initialization is no longer synchronous.

BUG=233664, 230197

Review URL: https://chromiumcodereview.appspot.com/12544032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196480 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 5 deletions

diff --git a/cc/test/fake_proxy.cc b/cc/test/fake_proxy.cc
index 0ec3ab2..9a3fc9d 100644
--- a/cc/test/fake_proxy.cc
+++ b/cc/test/fake_proxy.cc
@@ -6,17 +6,20 @@
 
 namespace cc {
 
+void FakeProxy::SetLayerTreeHost(LayerTreeHost* host) {
+  layer_tree_host_ = host;
+}
+
 bool FakeProxy::CompositeAndReadback(void* pixels, gfx::Rect rect) {
   return true;
 }
 
 bool FakeProxy::IsStarted() const { return true; }
 
-bool FakeProxy::InitializeOutputSurface() { return true; }
-
-bool FakeProxy::InitializeRenderer() { return true; }
-
-bool FakeProxy::RecreateOutputSurface() { return true; }
+void FakeProxy::CreateAndInitializeOutputSurface() {
+  DCHECK(layer_tree_host_);
+  layer_tree_host_->OnCreateAndInitializeOutputSurfaceAttempted(true);
+}
 
 const RendererCapabilities& FakeProxy::GetRendererCapabilities() const {
   return capabilities_;