| Index: cc/trees/layer_tree_host_unittest.cc
 | 
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
 | 
| index a1e82f8e9706a872aad42f6edf3f33756b0f38f0..11ab6db71d96cf5f7fd9de82b2c40ab12b7dffe8 100644
 | 
| --- a/cc/trees/layer_tree_host_unittest.cc
 | 
| +++ b/cc/trees/layer_tree_host_unittest.cc
 | 
| @@ -2093,7 +2093,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
 | 
|      settings.max_partial_texture_updates = 10;
 | 
|  
 | 
|      LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
 | 
| -    host.OnCreateAndInitializeOutputSurfaceAttempted(true);
 | 
|  
 | 
|      EXPECT_EQ(0u, host.MaxPartialTextureUpdates());
 | 
|    }
 | 
| @@ -2111,7 +2110,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
 | 
|      settings.max_partial_texture_updates = 10;
 | 
|  
 | 
|      LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
 | 
| -    host.OnCreateAndInitializeOutputSurfaceAttempted(true);
 | 
|  
 | 
|      EXPECT_EQ(5u, host.MaxPartialTextureUpdates());
 | 
|    }
 | 
| @@ -2129,7 +2127,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
 | 
|      settings.max_partial_texture_updates = 10;
 | 
|  
 | 
|      LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
 | 
| -    host.OnCreateAndInitializeOutputSurfaceAttempted(true);
 | 
|  
 | 
|      EXPECT_EQ(10u, host.MaxPartialTextureUpdates());
 | 
|    }
 | 
| @@ -2691,8 +2688,7 @@ class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
 | 
|  
 | 
|  class LayerTreeHostTestIOSurfaceDrawing : public LayerTreeHostTest {
 | 
|   protected:
 | 
| -  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
 | 
| -      bool fallback) override {
 | 
| +  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
 | 
|      scoped_ptr<MockIOSurfaceWebGraphicsContext3D> mock_context_owned(
 | 
|          new MockIOSurfaceWebGraphicsContext3D);
 | 
|      mock_context_ = mock_context_owned.get();
 | 
| @@ -2886,8 +2882,7 @@ class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
 | 
|      PostSetNeedsCommitToMainThread();
 | 
|    }
 | 
|  
 | 
| -  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
 | 
| -      bool fallback) override {
 | 
| +  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
 | 
|      scoped_ptr<TestWebGraphicsContext3D> context3d(
 | 
|          TestWebGraphicsContext3D::Create());
 | 
|  
 | 
| @@ -4405,8 +4400,7 @@ class LayerTreeHostTestMaxTransferBufferUsageBytes : public LayerTreeHostTest {
 | 
|      settings->use_one_copy = false;
 | 
|    }
 | 
|  
 | 
| -  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
 | 
| -      bool fallback) override {
 | 
| +  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
 | 
|      scoped_refptr<TestContextProvider> context_provider =
 | 
|          TestContextProvider::Create();
 | 
|      context_provider->SetMaxTransferBufferUsageBytes(512 * 512);
 | 
| @@ -4547,8 +4541,7 @@ class LayerTreeHostTestSetMemoryPolicyOnLostOutputSurface
 | 
|        : first_output_surface_memory_limit_(4321234),
 | 
|          second_output_surface_memory_limit_(1234321) {}
 | 
|  
 | 
| -  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
 | 
| -      bool fallback) override {
 | 
| +  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
 | 
|      if (!first_context_provider_.get()) {
 | 
|        first_context_provider_ = TestContextProvider::Create();
 | 
|      } else {
 | 
| @@ -4813,9 +4806,7 @@ class LayerTreeHostTestBreakSwapPromiseForContextAbortedCommit
 | 
|                     base::Unretained(this)));
 | 
|    }
 | 
|  
 | 
| -  void FindOutputSurface() {
 | 
| -    layer_tree_host()->OnCreateAndInitializeOutputSurfaceAttempted(true);
 | 
| -  }
 | 
| +  void FindOutputSurface() { layer_tree_host()->DidInitializeOutputSurface(); }
 | 
|  
 | 
|    void AfterTest() override {
 | 
|      {
 | 
| @@ -5691,8 +5682,7 @@ class LayerTreeHostTestCrispUpAfterPinchEndsWithOneCopy
 | 
|      settings->use_one_copy = true;
 | 
|    }
 | 
|  
 | 
| -  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
 | 
| -      bool fallback) override {
 | 
| +  scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
 | 
|      scoped_ptr<TestWebGraphicsContext3D> context3d =
 | 
|          TestWebGraphicsContext3D::Create();
 | 
|      context3d->set_support_image(true);
 | 
| 
 |