Index: sync/internal_api/attachments/attachment_uploader_impl.cc |
diff --git a/sync/internal_api/attachments/attachment_uploader_impl.cc b/sync/internal_api/attachments/attachment_uploader_impl.cc |
index e0246d80328cf625742ca349445b9e3b2040d16c..e0ad8d8074dcfd2832167951553374ae2af1e1d4 100644 |
--- a/sync/internal_api/attachments/attachment_uploader_impl.cc |
+++ b/sync/internal_api/attachments/attachment_uploader_impl.cc |
@@ -106,7 +106,7 @@ class AttachmentUploaderImpl::UploadState : public net::URLFetcherDelegate, |
url_request_context_getter_; |
Attachment attachment_; |
UploadCallbackList user_callbacks_; |
- scoped_ptr<net::URLFetcher> fetcher_; |
+ std::unique_ptr<net::URLFetcher> fetcher_; |
std::string account_id_; |
OAuth2TokenService::ScopeSet scopes_; |
std::string access_token_; |
@@ -114,7 +114,7 @@ class AttachmentUploaderImpl::UploadState : public net::URLFetcherDelegate, |
OAuth2TokenServiceRequest::TokenServiceProvider* token_service_provider_; |
// Pointer to the AttachmentUploaderImpl that owns this object. |
base::WeakPtr<AttachmentUploaderImpl> owner_; |
- scoped_ptr<OAuth2TokenServiceRequest> access_token_request_; |
+ std::unique_ptr<OAuth2TokenServiceRequest> access_token_request_; |
ModelType model_type_; |
DISALLOW_COPY_AND_ASSIGN(UploadState); |
@@ -325,7 +325,7 @@ void AttachmentUploaderImpl::UploadAttachment(const Attachment& attachment, |
} |
const GURL url = GetURLForAttachmentId(sync_service_url_, attachment_id); |
- scoped_ptr<UploadState> upload_state(new UploadState( |
+ std::unique_ptr<UploadState> upload_state(new UploadState( |
url, url_request_context_getter_, attachment, callback, account_id_, |
scopes_, token_service_provider_.get(), raw_store_birthday_, |
weak_ptr_factory_.GetWeakPtr(), model_type_)); |