Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/browser/frame_host/render_widget_host_view_child_frame_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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 33 matching lines @@
   ~MockRenderWidgetHostDelegate() override {}
  private:
   void Cut() override {}
   void Copy() override {}
   void Paste() override {}
   void SelectAll() override {}
 };
 
 class MockCrossProcessFrameConnector : public CrossProcessFrameConnector {
  public:
-  MockCrossProcessFrameConnector()
-      : CrossProcessFrameConnector(nullptr), last_scale_factor_received_(0.f) {}
+  MockCrossProcessFrameConnector() : CrossProcessFrameConnector(nullptr) {}
   ~MockCrossProcessFrameConnector() override {}
 
-  void SetChildFrameSurface(const cc::SurfaceId& surface_id,
-                            const gfx::Size& frame_size,
-                            float scale_factor,
+  void SetChildFrameSurface(const cc::SurfaceInfo& surface_info,
                             const cc::SurfaceSequence& sequence) override {
-    last_surface_id_received_ = surface_id;
-    last_frame_size_received_ = frame_size;
-    last_scale_factor_received_ = scale_factor;
+    last_surface_info_ = surface_info;
   }
 
   RenderWidgetHostViewBase* GetParentRenderWidgetHostView() override {
     return nullptr;
   }
 
-  cc::SurfaceId last_surface_id_received_;
-  gfx::Size last_frame_size_received_;
-  float last_scale_factor_received_;
+  cc::SurfaceInfo last_surface_info_;
 };
 
 }  // namespace
 
 class RenderWidgetHostViewChildFrameTest : public testing::Test {
  public:
   RenderWidgetHostViewChildFrameTest() {}
 
   void SetUp() override {
     browser_context_.reset(new TestBrowserContext);
@@ skipping 101 matching lines @@
     cc::SurfaceManager* manager =
         factory->GetContextFactoryPrivate()->GetSurfaceManager();
     cc::Surface* surface = manager->GetSurfaceForId(id);
     EXPECT_TRUE(surface);
     // There should be a SurfaceSequence created by the RWHVChildFrame.
     EXPECT_EQ(1u, surface->GetDestructionDependencyCount());
 #endif
 
     // Surface ID should have been passed to CrossProcessFrameConnector to
     // be sent to the embedding renderer.
-    EXPECT_EQ(id, test_frame_connector_->last_surface_id_received_);
-    EXPECT_EQ(view_size, test_frame_connector_->last_frame_size_received_);
-    EXPECT_EQ(scale_factor, test_frame_connector_->last_scale_factor_received_);
+    EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
+              test_frame_connector_->last_surface_info_);
   }
 }
 
 }  // namespace content