| 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_)) {
|
|
|