Make cc::CompositorFrames movable [Part 2 of 2]

components/mus/public/cpp/surfaces/surfaces_type_converters.cc

Index: components/mus/public/cpp/surfaces/surfaces_type_converters.cc
diff --git a/components/mus/public/cpp/surfaces/surfaces_type_converters.cc b/components/mus/public/cpp/surfaces/surfaces_type_converters.cc
index ca99f6358266dbe8e8d6867f589e6e75bdea9e74..c55addd49a0454f3ce0bdda2fa4d14d151dae0a2 100644
--- a/components/mus/public/cpp/surfaces/surfaces_type_converters.cc
+++ b/components/mus/public/cpp/surfaces/surfaces_type_converters.cc
@@ -48,8 +48,7 @@ TypeConverter<CompositorFramePtr, cc::CompositorFrame>::Convert(
 }
 
 // static
-std::unique_ptr<cc::CompositorFrame> ConvertToCompositorFrame(
-    const CompositorFramePtr& input) {
+cc::CompositorFrame ConvertToCompositorFrame(const CompositorFramePtr& input) {
   std::unique_ptr<cc::DelegatedFrameData> frame_data(
       new cc::DelegatedFrameData);
   frame_data->device_scale_factor = 1.f;
@@ -58,16 +57,16 @@ std::unique_ptr<cc::CompositorFrame> ConvertToCompositorFrame(
   for (size_t i = 0; i < input->passes.size(); ++i) {
     frame_data->render_pass_list.push_back(std::move(input->passes[i]));
   }
-  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
-  frame->metadata = input->metadata.Clone();
-  frame->delegated_frame_data = std::move(frame_data);
+  cc::CompositorFrame frame;
+  frame.metadata = input->metadata.Clone();
+  frame.delegated_frame_data = std::move(frame_data);
   return frame;
 }
 
 // static
-std::unique_ptr<cc::CompositorFrame>
-TypeConverter<std::unique_ptr<cc::CompositorFrame>,
-              CompositorFramePtr>::Convert(const CompositorFramePtr& input) {
+cc::CompositorFrame
+TypeConverter<cc::CompositorFrame, CompositorFramePtr>::Convert(
+    const CompositorFramePtr& input) {
   return ConvertToCompositorFrame(input);
 }