Update from chromium https://crrev.com/301315

cc/trees/layer_tree_host_unittest_context.cc

 // Copyright 2012 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
@@ skipping 384 matching lines @@
     return nullptr;
   }
 
   void DidInitializeOutputSurface() override { EXPECT_TRUE(false); }
 
   void AfterTest() override {}
 
   int request_count_;
 };
 
-SINGLE_THREAD_TEST_F(MultipleCompositeDoesNotCreateOutputSurface);
+SINGLE_THREAD_NOIMPL_TEST_F(MultipleCompositeDoesNotCreateOutputSurface);
 
 class FailedCreateDoesNotCreateExtraOutputSurface
     : public LayerTreeHostContextTest {
  public:
   FailedCreateDoesNotCreateExtraOutputSurface()
       : LayerTreeHostContextTest(), request_count_(0) {}
 
   void InitializeSettings(LayerTreeSettings* settings) override {
     settings->single_thread_proxy_scheduler = false;
   }
@@ skipping 17 matching lines @@
     return nullptr;
   }
 
   void DidInitializeOutputSurface() override { EXPECT_TRUE(false); }
 
   void AfterTest() override {}
 
   int request_count_;
 };
 
-SINGLE_THREAD_TEST_F(FailedCreateDoesNotCreateExtraOutputSurface);
+SINGLE_THREAD_NOIMPL_TEST_F(FailedCreateDoesNotCreateExtraOutputSurface);
+
+class LayerTreeHostContextTestCommitAfterDelayedOutputSurface
+    : public LayerTreeHostContextTest {
+ public:
+  LayerTreeHostContextTestCommitAfterDelayedOutputSurface()
+      : LayerTreeHostContextTest(), creating_output_(false) {}
+
+  void InitializeSettings(LayerTreeSettings* settings) override {
+    settings->single_thread_proxy_scheduler = false;
+  }
+
+  void RequestNewOutputSurface(bool fallback) override {
+    MainThreadTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(&LayerTreeHostContextTestCommitAfterDelayedOutputSurface::
+                       CreateAndSetOutputSurface,
+                   base::Unretained(this),
+                   fallback));
+  }
+
+  void CreateAndSetOutputSurface(bool fallback) {
+    creating_output_ = true;
+    layer_tree_host()->SetOutputSurface(
+        LayerTreeHostContextTest::CreateOutputSurface(fallback));
+  }
+
+  void BeginTest() override { layer_tree_host()->Composite(base::TimeTicks()); }
+
+  void ScheduleComposite() override {
+    if (creating_output_)
+      EndTest();
+  }
+
+  void AfterTest() override {}
+
+  bool creating_output_;
+};
+
+SINGLE_THREAD_NOIMPL_TEST_F(
+    LayerTreeHostContextTestCommitAfterDelayedOutputSurface);
+
+class LayerTreeHostContextTestAvoidUnnecessaryComposite
+    : public LayerTreeHostContextTest {
+ public:
+  LayerTreeHostContextTestAvoidUnnecessaryComposite()
+      : LayerTreeHostContextTest(), in_composite_(false) {}
+
+  void InitializeSettings(LayerTreeSettings* settings) override {
+    settings->single_thread_proxy_scheduler = false;
+  }
+
+  void RequestNewOutputSurface(bool fallback) override {
+    layer_tree_host()->SetOutputSurface(
+        LayerTreeHostContextTest::CreateOutputSurface(fallback));
+    EndTest();
+  }
+
+  void BeginTest() override {
+    in_composite_ = true;
+    layer_tree_host()->Composite(base::TimeTicks());
+    in_composite_ = false;
+  }
+
+  void ScheduleComposite() override { EXPECT_FALSE(in_composite_); }
+
+  void AfterTest() override {}
+
+  bool in_composite_;
+};
+
+SINGLE_THREAD_NOIMPL_TEST_F(LayerTreeHostContextTestAvoidUnnecessaryComposite);
 
 class LayerTreeHostContextTestLostContextSucceedsWithContent
     : public LayerTreeHostContextTestLostContextSucceeds {
  public:
   void SetupTree() override {
     root_ = Layer::Create();
     root_->SetBounds(gfx::Size(10, 10));
     root_->SetIsDrawable(true);
 
     // Paint non-solid color.
@@ skipping 1252 matching lines @@
   void AfterTest() override {}
 
   bool deferred_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
 
 }  // namespace
 }  // namespace cc