Remove SurfaceFactory::Reset

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>
@@ skipping 566 matching lines @@
   factory_->EvictSurface();
   EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
   EXPECT_TRUE(client_.returned_resources().empty());
   EXPECT_EQ(0u, execute_count);
 
   manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
   EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
   EXPECT_FALSE(client_.returned_resources().empty());
 }
 
-// Tests that SurfaceFactory returns resources after Reset().
-TEST_F(SurfaceFactoryTest, Reset) {
-  LocalSurfaceId id(7, kArbitraryToken);
-
-  TransferableResource resource;
-  resource.id = 1;
-  resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
-  CompositorFrame frame;
-  frame.resource_list.push_back(resource);
-  factory_->SubmitCompositorFrame(id, std::move(frame),
-                                  SurfaceFactory::DrawCallback());
-  EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
-
-  SurfaceId surface_id(kArbitraryFrameSinkId, id);
-  EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_TRUE(client_.returned_resources().empty());
-  factory_->Reset();
-  EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_FALSE(client_.returned_resources().empty());
-  local_surface_id_ = LocalSurfaceId();
-}
-
-// Tests that SurfaceFactory returns resources after Reset() if dependency
-// unregistered.
-TEST_F(SurfaceFactoryTest, ResetDependenceUnRegistered) {
-  LocalSurfaceId id(7, kArbitraryToken);
-
-  TransferableResource resource;
-  resource.id = 1;
-  resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
-  CompositorFrame frame;
-  frame.resource_list.push_back(resource);
-  factory_->SubmitCompositorFrame(id, std::move(frame),
-                                  SurfaceFactory::DrawCallback());
-  EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
-
-  SurfaceId surface_id(kArbitraryFrameSinkId, id);
-  Surface* surface = manager_.GetSurfaceForId(surface_id);
-  surface->AddDestructionDependency(
-      SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
-  EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_TRUE(client_.returned_resources().empty());
-  factory_->Reset();
-  EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_FALSE(client_.returned_resources().empty());
-  local_surface_id_ = LocalSurfaceId();
-}
-
-// Tests that SurfaceFactory doesn't return resources after Reset() if
-// dependency registered.
-TEST_F(SurfaceFactoryTest, ResetDependencyRegistered) {
-  LocalSurfaceId id(7, kArbitraryToken);
-
-  TransferableResource resource;
-  resource.id = 1;
-  resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
-  CompositorFrame frame;
-  frame.resource_list.push_back(resource);
-  factory_->SubmitCompositorFrame(id, std::move(frame),
-                                  SurfaceFactory::DrawCallback());
-  EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
-
-  manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
-
-  SurfaceId surface_id(kArbitraryFrameSinkId, id);
-  Surface* surface = manager_.GetSurfaceForId(surface_id);
-  surface->AddDestructionDependency(
-      SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
-  EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_TRUE(client_.returned_resources().empty());
-  factory_->Reset();
-  EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_TRUE(client_.returned_resources().empty());
-
-  manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
-  EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
-  EXPECT_TRUE(client_.returned_resources().empty());
-  local_surface_id_ = LocalSurfaceId();
-}
-
 TEST_F(SurfaceFactoryTest, DestroySequence) {
   LocalSurfaceId local_surface_id2(5, kArbitraryToken);
   std::unique_ptr<SurfaceFactory> factory2(
       new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
   SurfaceId id2(kArbitraryFrameSinkId, local_surface_id2);
   factory2->SubmitCompositorFrame(local_surface_id2, CompositorFrame(),
                                   SurfaceFactory::DrawCallback());
 
   manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
 
@@ skipping 162 matching lines @@
   factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
                                   SurfaceFactory::DrawCallback());
   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