Remove cc::LayerTreeHostImpl::IsContextLost

cc/trees/layer_tree_host_unittest_delegated.cc

 // Copyright 2013 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 <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 334 matching lines @@
       case 2:
         EXPECT_TRUE(delegated_impl->ChildId());
         EXPECT_FALSE(did_reset_child_id_);
 
         context_provider->ContextGL()->LoseContextCHROMIUM(
             GL_GUILTY_CONTEXT_RESET_ARB,
             GL_INNOCENT_CONTEXT_RESET_ARB);
         context_provider->ContextGL()->Flush();
         break;
       case 3:
-        EXPECT_TRUE(delegated_impl->ChildId());
-        EXPECT_TRUE(did_reset_child_id_);
-        EndTest();
+        if (HasImplThread())
+          CheckForChildResetAndEnd(delegated_impl);
+        break;
+      case 4:
+        if (!HasImplThread())
+          CheckForChildResetAndEnd(delegated_impl);
         break;
     }
   }
 
+  void CheckForChildResetAndEnd(
+      FakeDelegatedRendererLayerImpl* delegated_impl) {
+    EXPECT_TRUE(delegated_impl->ChildId());
+    EXPECT_TRUE(did_reset_child_id_);
+    EndTest();
+  }
+
   virtual void InitializedRendererOnThread(LayerTreeHostImpl* host_impl,
                                            bool success) OVERRIDE {
     EXPECT_TRUE(success);
 
     if (num_activates_ < 2)
       return;
 
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
         static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
 
-    EXPECT_EQ(2, num_activates_);
+    if (HasImplThread())

[danakj, 2014/08/20 18:22:10]

{} because the else needs them

[dneto, 2014/08/20 19:15:20]

Excellent. Control structures without braces freak me out.  Perl requires them,
which I like very much.

+      EXPECT_EQ(2, num_activates_);
+    else

[danakj, 2014/08/20 18:22:10]

{} because the body is more than one line

[dneto, 2014/08/20 19:15:20]

Acknowledged.

+      // The single thread proxy issues extra commits after the context is
+      // lost.  http://crbug.com/287250
+      EXPECT_EQ(3, num_activates_);
     EXPECT_FALSE(delegated_impl->ChildId());
     did_reset_child_id_ = true;
   }
 
  protected:
   int num_activates_;
   bool did_reset_child_id_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCreateChildId);
@@ skipping 54 matching lines @@
                                            bool success) OVERRIDE {
     EXPECT_TRUE(success);
 
     if (num_activates_ < 2)
       return;
 
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
         static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
 
-    EXPECT_EQ(2, num_activates_);
+    if (HasImplThread())

[danakj, 2014/08/20 18:22:10]

{}

+      EXPECT_EQ(2, num_activates_);
+    else

[danakj, 2014/08/20 18:22:10]

{}

+      // The single thread proxy issues extra commits after the context is
+      // lost.  http://crbug.com/287250
+      EXPECT_EQ(3, num_activates_);
     // Resources should have gotten cleared after the context was lost.
     EXPECT_EQ(0U, delegated_impl->Resources().size());
   }
 
   virtual void AfterTest() OVERRIDE {
     LayerTreeHostDelegatedTestCaseSingleDelegatedLayer::AfterTest();
     EXPECT_EQ(2, num_output_surfaces_initialized_);
   }
 
  protected:
@@ skipping 1733 matching lines @@
   }
 
   scoped_refptr<DelegatedRendererLayer> delegated_thief_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostDelegatedTestRemoveAndChangeResources);
 
 }  // namespace
 }  // namespace cc