cc: Fix recording of GPU rasterization histogram for renderer compositor.

cc/trees/layer_tree_host.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 <algorithm>
 #include <stack>
 #include <string>
 
@@ skipping 148 matching lines @@
       std::move(external_begin_frame_source)));
 }
 
 void LayerTreeHost::InitializeForTesting(
     scoped_ptr<TaskRunnerProvider> task_runner_provider,
     scoped_ptr<Proxy> proxy_for_testing) {
   task_runner_provider_ = std::move(task_runner_provider);
   InitializeProxy(std::move(proxy_for_testing));
 }
 
+void LayerTreeHost::SetTaskRunnerProviderForTesting(
+    scoped_ptr<TaskRunnerProvider> task_runner_provider) {
+  DCHECK(!task_runner_provider_);
+  task_runner_provider_ = std::move(task_runner_provider);
+}
+
 void LayerTreeHost::InitializeProxy(scoped_ptr<Proxy> proxy) {
   TRACE_EVENT0("cc", "LayerTreeHost::InitializeForReal");
 
   proxy_ = std::move(proxy);
   proxy_->Start();
   if (settings_.accelerated_animation_enabled) {
     if (animation_host_)
       animation_host_->SetSupportsScrollAnimations(
           proxy_->SupportsImplScrolling());
     else
@@ skipping 551 matching lines @@
     Layer* found = FindFirstScrollableLayer(layer->children()[i].get());
     if (found)
       return found;
   }
 
   return NULL;
 }
 
 void LayerTreeHost::RecordGpuRasterizationHistogram() {
   // Gpu rasterization is only supported for Renderer compositors.
-  // Checking for IsThreaded() to exclude Browser compositors.
-  if (gpu_rasterization_histogram_recorded_ || IsThreaded())
+  // Checking for IsSingleThreaded() to exclude Browser compositors.
+  if (gpu_rasterization_histogram_recorded_ || IsSingleThreaded())
     return;
 
   // Record how widely gpu rasterization is enabled.
   // This number takes device/gpu whitelisting/backlisting into account.
   // Note that we do not consider the forced gpu rasterization mode, which is
   // mostly used for debugging purposes.
   UMA_HISTOGRAM_BOOLEAN("Renderer4.GpuRasterizationEnabled",
                         settings_.gpu_rasterization_enabled);
   if (settings_.gpu_rasterization_enabled) {
     UMA_HISTOGRAM_BOOLEAN("Renderer4.GpuRasterizationTriggered",
@@ skipping 505 matching lines @@
   return compositor_mode_ == CompositorMode::SingleThreaded;
 }
 
 bool LayerTreeHost::IsThreaded() const {
   DCHECK(compositor_mode_ != CompositorMode::Threaded ||
          task_runner_provider_->HasImplThread());
   return compositor_mode_ == CompositorMode::Threaded;
 }
 
 }  // namespace cc