cc: Re-enable disabled tile manager unittests (plus fixes)

cc/test/fake_layer_tree_host_impl.cc

 // Copyright 2012 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/test/begin_frame_args_test.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
 FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(Proxy* proxy,
                                              SharedBitmapManager* manager,
                                              TaskGraphRunner* task_graph_runner)
-    : LayerTreeHostImpl(LayerTreeSettings(),
+    : FakeLayerTreeHostImpl(LayerTreeSettings(),
+                            proxy,
+                            manager,
+                            task_graph_runner,
+                            nullptr) {}
+
+FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(const LayerTreeSettings& settings,
+                                             Proxy* proxy,
+                                             SharedBitmapManager* manager,
+                                             TaskGraphRunner* task_graph_runner)
+    : FakeLayerTreeHostImpl(settings,
+                            proxy,
+                            manager,
+                            task_graph_runner,
+                            nullptr) {}
+
+FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(
+    const LayerTreeSettings& settings,
+    Proxy* proxy,
+    SharedBitmapManager* manager,
+    TaskGraphRunner* task_graph_runner,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
+    : LayerTreeHostImpl(settings,
                         &client_,
                         proxy,
                         &stats_instrumentation_,
                         manager,
-                        NULL,
+                        gpu_memory_buffer_manager,
                         task_graph_runner,
                         0) {
   // Explicitly clear all debug settings.
   SetDebugState(LayerTreeDebugState());
   SetViewportSize(gfx::Size(100, 100));
 
   // Start an impl frame so tests have a valid frame_time to work with.
   base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1);
-  WillBeginImplFrame(
-      CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
-}
-
-FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(const LayerTreeSettings& settings,
-                                             Proxy* proxy,
-                                             SharedBitmapManager* manager,
-                                             TaskGraphRunner* task_graph_runner)
-    : LayerTreeHostImpl(settings,
-                        &client_,
-                        proxy,
-                        &stats_instrumentation_,
-                        manager,
-                        NULL,
-                        task_graph_runner,
-                        0) {
-  // Explicitly clear all debug settings.
-  SetDebugState(LayerTreeDebugState());
-
-  // Start an impl frame so tests have a valid frame_time to work with.
-  base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1);
   WillBeginImplFrame(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
 }
 
 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {}
 
 void FakeLayerTreeHostImpl::CreatePendingTree() {
   LayerTreeHostImpl::CreatePendingTree();
   float arbitrary_large_page_scale = 100000.f;
   pending_tree()->PushPageScaleFromMainThread(
@@ skipping 29 matching lines @@
 
 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties(
     LayerTreeImpl* layerTree) {
   RecursiveUpdateNumChildren(layerTree->root_layer());
   bool update_lcd_text = false;
   layerTree->BuildPropertyTreesForTesting();
   layerTree->UpdateDrawProperties(update_lcd_text);
 }
 
 }  // namespace cc