Index: content/public/test/browser_test_utils.cc |
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc |
index 96a82ab0f72d039cecb77b3c9db1ae56b2fd1506..ef016f4e183aeef369fe723e93939987eeb1c1e6 100644 |
--- a/content/public/test/browser_test_utils.cc |
+++ b/content/public/test/browser_test_utils.cc |
@@ -1159,7 +1159,7 @@ FrameWatcher::~FrameWatcher() { |
void FrameWatcher::ReceivedFrameSwap(cc::CompositorFrameMetadata metadata) { |
--frames_to_wait_; |
- last_metadata_ = metadata; |
+ last_metadata_ = std::move(metadata); |
if (frames_to_wait_ == 0) |
quit_.Run(); |
} |
@@ -1169,12 +1169,12 @@ bool FrameWatcher::OnMessageReceived(const IPC::Message& message) { |
ViewHostMsg_SwapCompositorFrame::Param param; |
if (!ViewHostMsg_SwapCompositorFrame::Read(&message, ¶m)) |
return false; |
- std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); |
- std::get<1>(param).AssignTo(frame.get()); |
+ cc::CompositorFrame frame(std::move(std::get<1>(param))); |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |
- base::Bind(&FrameWatcher::ReceivedFrameSwap, this, frame->metadata)); |
+ base::Bind(&FrameWatcher::ReceivedFrameSwap, this, |
+ base::Passed(std::move(frame.metadata)))); |
} |
return false; |
} |