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

Unified Diff: remoting/test/cyclic_frame_generator.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/test/connection_time_observer_unittest.cc ('k') | remoting/test/cyclic_frame_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/test/cyclic_frame_generator.h
diff --git a/remoting/test/cyclic_frame_generator.h b/remoting/test/cyclic_frame_generator.h
index a77706a3f11fbd3c41f5e4016f8c143e439cf358..9dd26bae921abf7c93af1f9a92a9d7fd5ffaecce 100644
--- a/remoting/test/cyclic_frame_generator.h
+++ b/remoting/test/cyclic_frame_generator.h
@@ -6,10 +6,10 @@
#define REMOTING_TEST_CYCLIC_FRAME_GENERATOR_H_
#include <map>
+#include <memory>
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/default_tick_clock.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -47,7 +47,7 @@ class CyclicFrameGenerator
static scoped_refptr<CyclicFrameGenerator> Create();
CyclicFrameGenerator(
- std::vector<scoped_ptr<webrtc::DesktopFrame>> reference_frames);
+ std::vector<std::unique_ptr<webrtc::DesktopFrame>> reference_frames);
void set_frame_cycle_period(base::TimeDelta frame_cycle_period) {
frame_cycle_period_ = frame_cycle_period;
@@ -64,7 +64,7 @@ class CyclicFrameGenerator
// by its content.
void set_draw_barcode(bool draw_barcode) { draw_barcode_ = draw_barcode; }
- scoped_ptr<webrtc::DesktopFrame> GenerateFrame(
+ std::unique_ptr<webrtc::DesktopFrame> GenerateFrame(
webrtc::SharedMemoryFactory* shared_memory_factory);
FrameType last_frame_type() { return last_frame_type_; }
@@ -77,7 +77,7 @@ class CyclicFrameGenerator
~CyclicFrameGenerator();
friend class base::RefCountedThreadSafe<CyclicFrameGenerator>;
- std::vector<scoped_ptr<webrtc::DesktopFrame>> reference_frames_;
+ std::vector<std::unique_ptr<webrtc::DesktopFrame>> reference_frames_;
base::DefaultTickClock default_tick_clock_;
base::TickClock* clock_;
webrtc::DesktopSize screen_size_;
« no previous file with comments | « remoting/test/connection_time_observer_unittest.cc ('k') | remoting/test/cyclic_frame_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698