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

Unified Diff: extensions/browser/api/cast_channel/cast_framer.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/cast_framer.cc
diff --git a/extensions/browser/api/cast_channel/cast_framer.cc b/extensions/browser/api/cast_channel/cast_framer.cc
index 70d6eb0c17b6f3d9b23ebf44ecaab7f3b62b0d37..c0dec4957b6ca41c1389e102d8fde0c3b7c8d935 100644
--- a/extensions/browser/api/cast_channel/cast_framer.cc
+++ b/extensions/browser/api/cast_channel/cast_framer.cc
@@ -40,7 +40,7 @@ void MessageFramer::MessageHeader::PrependToString(std::string* str) {
MessageHeader output = *this;
output.message_size = base::HostToNet32(message_size);
size_t header_size = MessageHeader::header_size();
- scoped_ptr<char, base::FreeDeleter> char_array(
+ std::unique_ptr<char, base::FreeDeleter> char_array(
static_cast<char*>(malloc(header_size)));
memcpy(char_array.get(), &output, header_size);
str->insert(0, char_array.get(), header_size);
@@ -113,9 +113,9 @@ size_t MessageFramer::BytesRequested() {
}
}
-scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
- size_t* message_length,
- ChannelError* error) {
+std::unique_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
+ size_t* message_length,
+ ChannelError* error) {
DCHECK(error);
DCHECK(message_length);
if (error_) {
@@ -147,7 +147,7 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
break;
case BODY:
if (BytesRequested() == 0) {
- scoped_ptr<CastMessage> parsed_message(new CastMessage);
+ std::unique_ptr<CastMessage> parsed_message(new CastMessage);
if (!parsed_message->ParseFromArray(
input_buffer_->StartOfBuffer() + MessageHeader::header_size(),
body_size_)) {
« no previous file with comments | « extensions/browser/api/cast_channel/cast_framer.h ('k') | extensions/browser/api/cast_channel/cast_framer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698