Unify SurfaceInfo

cc/surfaces/surface_factory_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 "cc/surfaces/surface_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #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"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 namespace {
 
 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 static constexpr FrameSinkId kAnotherArbitraryFrameSinkId(2, 2);
@@ skipping 45 matching lines @@
         frame_sync_token_(GenTestSyncToken(4)),
         consumer_sync_token_(GenTestSyncToken(5)) {
     manager_.AddObserver(this);
   }
 
   const SurfaceId& last_created_surface_id() const {
     return last_created_surface_id_;
   }
 
   // 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 {
     *changed = true;
   }
 
   ~SurfaceFactoryTest() override {
     manager_.RemoveObserver(this);
     factory_->EvictSurface();
   }
@@ skipping 566 matching lines @@
 
   factory_->EvictSurface();
   local_frame_id_ = LocalFrameId();
   EXPECT_TRUE(called1);
   EXPECT_TRUE(called2);
   EXPECT_TRUE(called3);
 }
 
 }  // namespace
 }  // namespace cc