Unify SurfaceInfo

cc/surfaces/surface_factory_unittest.cc

Index: cc/surfaces/surface_factory_unittest.cc
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index 3e7e25e2de81fc0f08d7d14eacd363b34f99cd47..2bc51e9d638d3a820971507c2f754c5ab7abbde7 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -18,6 +18,7 @@
 #include "cc/resources/resource_provider.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -83,11 +84,9 @@ class SurfaceFactoryTest : public testing::Test, public SurfaceObserver {
   }
 
   // SurfaceObserver implementation.
-  void OnSurfaceCreated(const SurfaceId& surface_id,
-                        const gfx::Size& frame,
-                        float device_scale_factor) override {
-    EXPECT_EQ(kArbitraryFrameSinkId, surface_id.frame_sink_id());
-    last_created_surface_id_ = surface_id;
+  void OnSurfaceCreated(const SurfaceInfo& surface_info) override {
+    EXPECT_EQ(kArbitraryFrameSinkId, surface_info.id().frame_sink_id());
+    last_created_surface_id_ = surface_info.id();
   }
 
   void OnSurfaceDamaged(const SurfaceId& id, bool* changed) override {