| Index: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
|
| index 98d6d3ed46398f87a04d50163f4c56d849e94d3d..d514b5d95889afcd8a91da9f04573f9633b65276 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
|
| @@ -25,16 +25,16 @@ namespace drive_backend {
|
|
|
| namespace {
|
|
|
| -void DidAddFileOrDirectoryForMakingConflict(DriveApiErrorCode error,
|
| - scoped_ptr<FileResource> entry) {
|
| +void DidAddFileOrDirectoryForMakingConflict(
|
| + DriveApiErrorCode error,
|
| + std::unique_ptr<FileResource> entry) {
|
| ASSERT_EQ(google_apis::HTTP_CREATED, error);
|
| ASSERT_TRUE(entry);
|
| }
|
|
|
| -void DidAddFileForUploadNew(
|
| - const UploadCompletionCallback& callback,
|
| - DriveApiErrorCode error,
|
| - scoped_ptr<FileResource> entry) {
|
| +void DidAddFileForUploadNew(const UploadCompletionCallback& callback,
|
| + DriveApiErrorCode error,
|
| + std::unique_ptr<FileResource> entry) {
|
| ASSERT_EQ(google_apis::HTTP_CREATED, error);
|
| ASSERT_TRUE(entry);
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| @@ -48,7 +48,7 @@ void DidAddFileForUploadNew(
|
| void DidGetFileResourceForUploadExisting(
|
| const UploadCompletionCallback& callback,
|
| DriveApiErrorCode error,
|
| - scoped_ptr<FileResource> entry) {
|
| + std::unique_ptr<FileResource> entry) {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback,
|
|
|