Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Side by Side Diff: remoting/protocol/fake_video_renderer.cc

Issue 2253233004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/fake_video_renderer.h" 5 #include "remoting/protocol/fake_video_renderer.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 27 matching lines...) Expand all
38 FakeFrameConsumer::~FakeFrameConsumer() {} 38 FakeFrameConsumer::~FakeFrameConsumer() {}
39 39
40 void FakeFrameConsumer::set_on_frame_callback(base::Closure on_frame_callback) { 40 void FakeFrameConsumer::set_on_frame_callback(base::Closure on_frame_callback) {
41 CHECK(thread_checker_.CalledOnValidThread()); 41 CHECK(thread_checker_.CalledOnValidThread());
42 on_frame_callback_ = on_frame_callback; 42 on_frame_callback_ = on_frame_callback;
43 } 43 }
44 44
45 std::unique_ptr<webrtc::DesktopFrame> FakeFrameConsumer::AllocateFrame( 45 std::unique_ptr<webrtc::DesktopFrame> FakeFrameConsumer::AllocateFrame(
46 const webrtc::DesktopSize& size) { 46 const webrtc::DesktopSize& size) {
47 CHECK(thread_checker_.CalledOnValidThread()); 47 CHECK(thread_checker_.CalledOnValidThread());
48 return base::WrapUnique(new webrtc::BasicDesktopFrame(size)); 48 return base::MakeUnique<webrtc::BasicDesktopFrame>(size);
49 } 49 }
50 50
51 void FakeFrameConsumer::DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame, 51 void FakeFrameConsumer::DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
52 const base::Closure& done) { 52 const base::Closure& done) {
53 CHECK(thread_checker_.CalledOnValidThread()); 53 CHECK(thread_checker_.CalledOnValidThread());
54 received_frames_.push_back(std::move(frame)); 54 received_frames_.push_back(std::move(frame));
55 if (!done.is_null()) 55 if (!done.is_null())
56 done.Run(); 56 done.Run();
57 if (!on_frame_callback_.is_null()) 57 if (!on_frame_callback_.is_null())
58 on_frame_callback_.Run(); 58 on_frame_callback_.Run();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 return &frame_consumer_; 99 return &frame_consumer_;
100 } 100 }
101 101
102 FakeFrameStatsConsumer* FakeVideoRenderer::GetFrameStatsConsumer() { 102 FakeFrameStatsConsumer* FakeVideoRenderer::GetFrameStatsConsumer() {
103 CHECK(thread_checker_.CalledOnValidThread()); 103 CHECK(thread_checker_.CalledOnValidThread());
104 return &frame_stats_consumer_; 104 return &frame_stats_consumer_;
105 } 105 }
106 106
107 } // namespace protocol 107 } // namespace protocol
108 } // namespace remoting 108 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/fake_authenticator.cc ('k') | remoting/protocol/http_ice_config_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698