Remove non-leaky LazyInstances in cc.

cc/layers/picture_layer_unittest.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/layers/picture_layer.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/content_layer_client.h"
-#include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/paint/paint_flags.h"
 #include "cc/test/fake_compositor_frame_sink.h"
+#include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/layer_tree_settings_for_testing.h"
 #include "cc/test/skia_common.h"
 #include "cc/test/stub_layer_tree_host_single_thread_client.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace cc {
 
 namespace {
 
 TEST(PictureLayerTest, NoTilesIfEmptyBounds) {
-  ContentLayerClient* client = EmptyContentLayerClient::GetInstance();
-  scoped_refptr<PictureLayer> layer = PictureLayer::Create(client);
+  FakeContentLayerClient client;
+  client.set_bounds(gfx::Size());
+  scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
   layer->SetBounds(gfx::Size(10, 10));
 
   FakeLayerTreeHostClient host_client;
   TestTaskGraphRunner task_graph_runner;
   auto animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(
       &host_client, &task_graph_runner, animation_host.get());
   host->SetRootLayer(layer);
   layer->SetIsDrawable(true);
   layer->SavePaintProperties();
@@ skipping 191 matching lines @@
   host_impl.active_tree()->root_layer_for_testing()->AppendQuads(
       render_pass.get(), &data);
   host_impl.active_tree()->root_layer_for_testing()->DidDraw(nullptr);
 }
 
 TEST(PictureLayerTest, SuitableForGpuRasterization) {
   std::unique_ptr<FakeRecordingSource> recording_source_owned(
       new FakeRecordingSource);
   FakeRecordingSource* recording_source = recording_source_owned.get();
 
-  ContentLayerClient* client = EmptyContentLayerClient::GetInstance();
+  FakeContentLayerClient client;
+  client.set_bounds(gfx::Size());
   scoped_refptr<FakePictureLayer> layer =
       FakePictureLayer::CreateWithRecordingSource(
-          client, std::move(recording_source_owned));
+          &client, std::move(recording_source_owned));
 
   FakeLayerTreeHostClient host_client;
   TestTaskGraphRunner task_graph_runner;
   auto animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(
       &host_client, &task_graph_runner, animation_host.get());
   host->SetRootLayer(layer);
 
   // Update layers to initialize the recording source.
   gfx::Size layer_bounds(200, 200);
   gfx::Rect layer_rect(layer_bounds);
   Region invalidation(layer_rect);
 
-  gfx::Rect new_recorded_viewport = client->PaintableRegion();
+  gfx::Rect new_recorded_viewport = client.PaintableRegion();
   scoped_refptr<DisplayItemList> display_list =
-      client->PaintContentsToDisplayList(
+      client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
   size_t painter_reported_memory_usage =
-      client->GetApproximateUnsharedMemoryUsage();
+      client.GetApproximateUnsharedMemoryUsage();
   recording_source->UpdateAndExpandInvalidation(&invalidation, layer_bounds,
                                                 new_recorded_viewport);
   recording_source->UpdateDisplayItemList(display_list,
                                           painter_reported_memory_usage);
 
   // Layer is suitable for gpu rasterization by default.
   EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
 
   // Veto gpu rasterization.
   layer->set_force_unsuitable_for_gpu_rasterization(true);
   EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
 }
 
 // PicturePile uses the source frame number as a unit for measuring invalidation
 // frequency. When a pile moves between compositors, the frame number increases
 // non-monotonically. This executes that code path under this scenario allowing
 // for the code to verify correctness with DCHECKs.
 TEST(PictureLayerTest, NonMonotonicSourceFrameNumber) {
   LayerTreeSettings settings = LayerTreeSettingsForTesting();
   settings.single_thread_proxy_scheduler = false;
   settings.use_zero_copy = true;
 
   StubLayerTreeHostSingleThreadClient single_thread_client;
   FakeLayerTreeHostClient host_client1;
   FakeLayerTreeHostClient host_client2;
   TestTaskGraphRunner task_graph_runner;
 
-  ContentLayerClient* client = EmptyContentLayerClient::GetInstance();
-  scoped_refptr<FakePictureLayer> layer = FakePictureLayer::Create(client);
+  FakeContentLayerClient client;
+  client.set_bounds(gfx::Size());
+  scoped_refptr<FakePictureLayer> layer = FakePictureLayer::Create(&client);
 
   auto animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
 
   LayerTreeHost::InitParams params;
   params.client = &host_client1;
   params.settings = &settings;
   params.task_graph_runner = &task_graph_runner;
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.mutator_host = animation_host.get();
   std::unique_ptr<LayerTreeHost> host1 =
@@ skipping 41 matching lines @@
   host2->Composite(base::TimeTicks::Now());
   EXPECT_EQ(3, layer->update_count());
   EXPECT_EQ(1, host2->SourceFrameNumber());
 
   animation_host->SetMutatorHostClient(nullptr);
   animation_host2->SetMutatorHostClient(nullptr);
 }
 
 }  // namespace
 }  // namespace cc