Update from https://crrev.com/306901

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 {
@@ skipping 34 matching lines @@
   base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1);
   SetCurrentBeginFrameArgs(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
 }
 
 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {}
 
 void FakeLayerTreeHostImpl::CreatePendingTree() {
   LayerTreeHostImpl::CreatePendingTree();
   float arbitrary_large_page_scale = 100000.f;
-  pending_tree()->SetPageScaleFactorAndLimits(
+  pending_tree()->PushPageScaleFromMainThread(
       1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale);
 }
 
 BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const {
   if (!current_begin_frame_args_.IsValid())
     return LayerTreeHostImpl::CurrentBeginFrameArgs();
   return current_begin_frame_args_;
 }
 
 void FakeLayerTreeHostImpl::SetCurrentBeginFrameArgs(
@@ skipping 17 matching lines @@
   UpdateNumChildrenAndDrawProperties(active_tree());
 }
 
 void FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties(
     LayerTreeImpl* layerTree) {
   RecursiveUpdateNumChildren(layerTree->root_layer());
   layerTree->UpdateDrawProperties();
 }
 
 }  // namespace cc