Index: google_apis/gcm/engine/connection_handler_impl.cc |
diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc |
index eb3e01ef19e4fe0fc985a5390764e97accdc7b7b..332248f94e6da22ce94c4427c06414eb5e611d43 100644 |
--- a/google_apis/gcm/engine/connection_handler_impl.cc |
+++ b/google_apis/gcm/engine/connection_handler_impl.cc |
@@ -312,7 +312,7 @@ void ConnectionHandlerImpl::OnGotVersion() { |
void ConnectionHandlerImpl::OnGotMessageTag() { |
if (input_stream_->GetState() != SocketInputStream::READY) { |
LOG(ERROR) << "Failed to receive protobuf tag."; |
- read_callback_.Run(scoped_ptr<google::protobuf::MessageLite>()); |
+ read_callback_.Run(std::unique_ptr<google::protobuf::MessageLite>()); |
return; |
} |
@@ -336,7 +336,7 @@ void ConnectionHandlerImpl::OnGotMessageTag() { |
void ConnectionHandlerImpl::OnGotMessageSize() { |
if (input_stream_->GetState() != SocketInputStream::READY) { |
LOG(ERROR) << "Failed to receive message size."; |
- read_callback_.Run(scoped_ptr<google::protobuf::MessageLite>()); |
+ read_callback_.Run(std::unique_ptr<google::protobuf::MessageLite>()); |
return; |
} |
@@ -381,7 +381,7 @@ void ConnectionHandlerImpl::OnGotMessageSize() { |
void ConnectionHandlerImpl::OnGotMessageBytes() { |
read_timeout_timer_.Stop(); |
- scoped_ptr<google::protobuf::MessageLite> protobuf( |
+ std::unique_ptr<google::protobuf::MessageLite> protobuf( |
BuildProtobufFromTag(message_tag_)); |
// Messages with no content are valid; just use the default protobuf for |
// that tag. |