cc: Use BeginFrameArgs

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 "cc/layers/delegated_renderer_layer.h"
@@ skipping 275 matching lines @@
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
         static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
 
     ContextProvider* context_provider =
         host_impl->output_surface()->context_provider();
 
     ++num_activates_;
-    switch (num_activates_) {
-      case 2:
-        EXPECT_TRUE(delegated_impl->ChildId());
-        EXPECT_FALSE(did_reset_child_id_);
-
-        context_provider->Context3d()->loseContextCHROMIUM(
-            GL_GUILTY_CONTEXT_RESET_ARB,
-            GL_INNOCENT_CONTEXT_RESET_ARB);
-        break;
-      case 3:
-        EXPECT_TRUE(delegated_impl->ChildId());
-        EXPECT_TRUE(did_reset_child_id_);
-        EndTest();
-        break;
+    if (num_activates_ == 2) {
+      EXPECT_TRUE(delegated_impl->ChildId());
+      EXPECT_FALSE(did_reset_child_id_);
+      context_provider->Context3d()->loseContextCHROMIUM(
+          GL_GUILTY_CONTEXT_RESET_ARB,
+          GL_INNOCENT_CONTEXT_RESET_ARB);
+    } else if (did_reset_child_id_) {
+      EXPECT_TRUE(delegated_impl->ChildId());
+      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_);
+    EXPECT_LE(2, num_activates_);
     EXPECT_FALSE(delegated_impl->ChildId());
     did_reset_child_id_ = true;
   }
 
   virtual void AfterTest() OVERRIDE {}
 
  protected:
   int num_activates_;
   bool did_reset_child_id_;
 };
@@ skipping 1242 matching lines @@
     }
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake);
 
 }  // namespace
 }  // namespace cc