Seems incorrect to se device_scale_factor in SetLocalSurfaceId.

cc/surfaces/display_unittest.cc

Index: cc/surfaces/display_unittest.cc
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index 159c7ab7035faef705196bc69f8c3975b97c364c..77a1b5d109b86380a7d4366b3d7ebf53cd83f00b 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -189,7 +189,8 @@ TEST_F(DisplayTest, DisplayDamaged) {
   LocalSurfaceId local_surface_id(id_allocator_.GenerateId());
   EXPECT_FALSE(scheduler_->damaged);
   EXPECT_FALSE(scheduler_->has_new_root_surface);
-  display_->SetLocalSurfaceId(local_surface_id, 1.f);
+  display_->SetLocalSurfaceId(local_surface_id);
+  display_->SetDeviceScaleFactor(1.f);
   EXPECT_FALSE(scheduler_->damaged);
   EXPECT_FALSE(scheduler_->display_resized_);
   EXPECT_TRUE(scheduler_->has_new_root_surface);
@@ -444,7 +445,8 @@ TEST_F(DisplayTest, Finish) {
   StubDisplayClient client;
   display_->Initialize(&client, &manager_);
 
-  display_->SetLocalSurfaceId(local_surface_id, 1.f);
+  display_->SetLocalSurfaceId(local_surface_id);
+  display_->SetDeviceScaleFactor(1.f);
 
   display_->Resize(gfx::Size(100, 100));