[cc] Fix LayerTreeHostTestBeginFrameSequenceNumbers.

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 7063 matching lines @@
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     // We should only draw in second BeginFrame.
     EXPECT_TRUE(current_begin_main_frame_args_on_impl_.IsValid());
     EXPECT_LT(current_begin_main_frame_args_on_impl_.sequence_number,
               current_begin_frame_args_.sequence_number);
     frame_data_ = frame_data;
     return draw_result;
   }
 
+  void DisplayReceivedCompositorFrameOnThread(
+      const CompositorFrame& frame) override {
+    if (compositor_frame_submitted_)
+      return;
+    compositor_frame_submitted_ = true;
+
+    EXPECT_EQ(
+        BeginFrameAck(current_begin_frame_args_.source_id,
+                      current_begin_frame_args_.sequence_number,
+                      current_begin_main_frame_args_on_impl_.sequence_number, 0,
+                      true),
+        frame.metadata.begin_frame_ack);
+  }
+
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
+    if (layers_drawn_)
+      return;
+    layers_drawn_ = true;
+
     EXPECT_TRUE(frame_data_);
+    EXPECT_TRUE(compositor_frame_submitted_);
     EXPECT_EQ(
         BeginFrameAck(current_begin_frame_args_.source_id,
                       current_begin_frame_args_.sequence_number,
                       current_begin_main_frame_args_on_impl_.sequence_number, 0,
                       true),
         frame_data_->begin_frame_ack);
-  }
-
-  void DisplayReceivedCompositorFrameOnThread(
-      const CompositorFrame& frame) override {
-    compositor_frame_submitted_ = true;
-    EXPECT_EQ(
-        BeginFrameAck(current_begin_frame_args_.source_id,
-                      current_begin_frame_args_.sequence_number,
-                      current_begin_main_frame_args_on_impl_.sequence_number, 0,
-                      true),
-        frame.metadata.begin_frame_ack);
     EndTest();
   }
 
-  void AfterTest() override { EXPECT_TRUE(compositor_frame_submitted_); }
+  void AfterTest() override { EXPECT_TRUE(layers_drawn_); }
 
  private:
-  bool compositor_frame_submitted_;
+  bool compositor_frame_submitted_ = false;
+  bool layers_drawn_ = false;
   BeginFrameArgs current_begin_frame_args_;
   BeginFrameArgs current_begin_main_frame_args_;
   BeginFrameArgs current_begin_main_frame_args_on_impl_;
   LayerTreeHostImpl::FrameData* frame_data_;
 };
 
 MULTI_THREAD_BLOCKNOTIFY_TEST_F(LayerTreeHostTestBeginFrameSequenceNumbers);
 
 class LayerTreeHostTestQueueImageDecode : public LayerTreeHostTest {
  protected:
@@ skipping 56 matching lines @@
 
  private:
   bool first_ = true;
   SkBitmap bitmap_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestQueueImageDecodeNonLazy);
 
 }  // namespace
 }  // namespace cc