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

Unified Diff: extensions/browser/api/cast_channel/keep_alive_delegate.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: extensions/browser/api/cast_channel/keep_alive_delegate.cc
diff --git a/extensions/browser/api/cast_channel/keep_alive_delegate.cc b/extensions/browser/api/cast_channel/keep_alive_delegate.cc
index fe1bd9167fc32064f47f4db02f975ff9f295fb45..f77c9b0beb00deceaa8f9a2011d1e6f27caf9d3a 100644
--- a/extensions/browser/api/cast_channel/keep_alive_delegate.cc
+++ b/extensions/browser/api/cast_channel/keep_alive_delegate.cc
@@ -36,7 +36,7 @@ bool NestedPayloadTypeEquals(const std::string& chk_type,
if (!message_info.data->GetAsString(&type_json)) {
return false;
}
- scoped_ptr<base::Value> type_value(base::JSONReader::Read(type_json));
+ std::unique_ptr<base::Value> type_value(base::JSONReader::Read(type_json));
if (!type_value.get()) {
return false;
}
@@ -82,7 +82,7 @@ CastMessage KeepAliveDelegate::CreateKeepAliveMessage(
KeepAliveDelegate::KeepAliveDelegate(
CastSocket* socket,
scoped_refptr<Logger> logger,
- scoped_ptr<CastTransport::Delegate> inner_delegate,
+ std::unique_ptr<CastTransport::Delegate> inner_delegate,
base::TimeDelta ping_interval,
base::TimeDelta liveness_timeout)
: started_(false),
@@ -102,8 +102,8 @@ KeepAliveDelegate::~KeepAliveDelegate() {
}
void KeepAliveDelegate::SetTimersForTest(
- scoped_ptr<base::Timer> injected_ping_timer,
- scoped_ptr<base::Timer> injected_liveness_timer) {
+ std::unique_ptr<base::Timer> injected_ping_timer,
+ std::unique_ptr<base::Timer> injected_liveness_timer) {
ping_timer_ = std::move(injected_ping_timer);
liveness_timer_ = std::move(injected_liveness_timer);
}

Powered by Google App Engine
This is Rietveld 408576698