extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc - Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase 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 | « extensions/renderer/api/display_source/wifi_display/wifi_display_session.h ('k') | extensions/renderer/api/serial/data_receiver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

index 43e770c000fbfdebf4b0898e018c37174a5fd453..93e9c4d263b14851f303ff0c4f07f199e4e5e355 100644

--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc

@@ -140,10 +140,9 @@ void WiFiDisplaySession::SendRTSPData(const std::string& message) {

}

unsigned WiFiDisplaySession::CreateTimer(int seconds) {

- scoped_ptr<base::Timer> timer(new base::Timer(true, true));

- auto insert_ret = timers_.insert(

- std::pair<int, scoped_ptr<base::Timer>>(

- ++timer_id_, std::move(timer)));

+ std::unique_ptr<base::Timer> timer(new base::Timer(true, true));

+ auto insert_ret = timers_.insert(std::pair<int, std::unique_ptr<base::Timer>>(

+ ++timer_id_, std::move(timer)));

DCHECK(insert_ret.second);

insert_ret.first->second->Start(FROM_HERE,

base::TimeDelta::FromSeconds(seconds),