Fix SurfaceLayerImpl scale under impl-side painting

cc/layers/surface_layer_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 <set>
 #include <vector>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 98 matching lines @@
 
   // Layer was removed so sequence from first LayerTreeHost should be
   // satisfied.
   EXPECT_TRUE(blank_change == expected1);
 
   // No more SurfaceSequences should have been generated that need to have be
   // satisfied.
   EXPECT_EQ(2u, required_seq.size());
 }
 
-static void CalcDrawProps(FakeLayerTreeHost* host, float device_scale_factor) {
-  RenderSurfaceLayerList render_surface_layer_list;
-  LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-      host->root_layer(), gfx::Size(500, 500), &render_surface_layer_list);
-  inputs.device_scale_factor = device_scale_factor;
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
-}
-
-// Check that setting content scale on the surface works.
-TEST_F(SurfaceLayerTest, ScaleSurface) {
-  SurfaceSequence blank_change;
-  SurfaceId required_id;
-  std::set<SurfaceSequence> required_seq;
-  scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
-      layer_settings_, base::Bind(&SatisfyCallback, &blank_change),
-      base::Bind(&RequireCallback, &required_id, &required_seq)));
-  gfx::Size surface_size(10, 15);
-  layer->SetSurfaceId(SurfaceId(1), 2.f, surface_size);
-  layer->SetBounds(gfx::Size(25, 45));
-  layer_tree_host_->SetRootLayer(layer);
-
-  CalcDrawProps(layer_tree_host_.get(), 5.f);
-  EXPECT_EQ(2.f, layer->contents_scale_x());
-  EXPECT_EQ(2.f, layer->contents_scale_y());
-  EXPECT_EQ(surface_size.ToString(), layer->content_bounds().ToString());
-
-  layer_tree_host_->SetRootLayer(nullptr);
-  layer_tree_host_.reset();
-}
-
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromise : public LayerTreeTest {
  public:
   SurfaceLayerSwapPromise()
       : commit_count_(0), sequence_was_satisfied_(false) {}
 
   void BeginTest() override {
     layer_tree_host()->set_surface_id_namespace(1);
     layer_ = SurfaceLayer::Create(
         layer_settings(), base::Bind(&SatisfyCallback, &satisfied_sequence_),
@@ skipping 74 matching lines @@
   SurfaceId required_id_;
   std::set<SurfaceSequence> required_set_;
 };
 
 // TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
 // fixed.
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromise);
 
 }  // namespace
 }  // namespace cc