Don't submit frames with no render passes in cc tests

cc/surfaces/surface_factory_unittest.cc

 // Copyright 2014 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/surfaces/surface_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/surfaces/frame_sink_manager_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_resource_holder_client.h"
+#include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/fake_surface_resource_holder_client.h"
 #include "cc/test/scheduler_test_common.h"
 #include "cc/test/stub_surface_factory_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 namespace {
 
 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
@@ skipping 40 matching lines @@
     *changed = true;
   }
 
   ~SurfaceFactoryTest() override {
     manager_.RemoveObserver(this);
     factory_->EvictSurface();
   }
 
   void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
                                           size_t num_resource_ids) {
-    CompositorFrame frame;
+    CompositorFrame frame = test::MakeCompositorFrame();
     for (size_t i = 0u; i < num_resource_ids; ++i) {
       TransferableResource resource;
       resource.id = resource_ids[i];
       resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
       resource.mailbox_holder.sync_token = frame_sync_token_;
       frame.resource_list.push_back(resource);
     }
     factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
                                     SurfaceFactory::DrawCallback(),
                                     SurfaceFactory::WillDrawCallback());
@@ skipping 348 matching lines @@
   {
     SCOPED_TRACE("fourth frame, second unref");
     ResourceId expected_returned_ids[] = {12, 13};
     int expected_returned_counts[] = {2, 2};
     CheckReturnedResourcesMatchExpected(
         expected_returned_ids, expected_returned_counts,
         arraysize(expected_returned_counts), consumer_sync_token_);
   }
 }
 
-TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) {
-  LocalSurfaceId local_surface_id(6, kArbitraryToken);
-  SurfaceId surface_id(kArbitraryFrameSinkId, local_surface_id);
-  factory_->SubmitCompositorFrame(local_surface_id, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback(),
-                                  SurfaceFactory::WillDrawCallback());
-  Surface* surface = manager_.GetSurfaceForId(surface_id);
-  ASSERT_NE(nullptr, surface);
-  EXPECT_EQ(2, surface->frame_index());
-  EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id);
-}
-
 void CreateSurfaceDrawCallback(SurfaceFactory* factory,
                                uint32_t* execute_count) {
   LocalSurfaceId new_id(7, base::UnguessableToken::Create());
   factory->SubmitCompositorFrame(new_id, CompositorFrame(),
                                  SurfaceFactory::DrawCallback(),
                                  SurfaceFactory::WillDrawCallback());
   factory->EvictSurface();
   *execute_count += 1;
 }
 
@@ skipping 295 matching lines @@
                                   SurfaceFactory::DrawCallback(),
                                   SurfaceFactory::WillDrawCallback());
   SurfaceId expected_surface_id(factory_->frame_sink_id(), local_surface_id_);
   EXPECT_EQ(expected_surface_id, last_surface_info_.id());
   EXPECT_EQ(2.5f, last_surface_info_.device_scale_factor());
   EXPECT_EQ(gfx::Size(7, 8), last_surface_info_.size_in_pixels());
 }
 
 }  // namespace
 }  // namespace cc