| Index: chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
|
| diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
|
| index c2ae8c6582a57af9a5d7a64987a0d0ba2632faaa..b62964ffd655f87f35c74d6f7c95a52a0e6246be 100644
|
| --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
|
| +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
|
| @@ -57,7 +57,7 @@ void RunStatusCallbackByFileError(const StatusCallback& callback,
|
| // Runs |callback| with arguments converted from |error| and |entry|.
|
| void RunGetFileInfoCallback(const GetFileInfoCallback& callback,
|
| FileError error,
|
| - scoped_ptr<ResourceEntry> entry) {
|
| + std::unique_ptr<ResourceEntry> entry) {
|
| if (error != FILE_ERROR_OK) {
|
| callback.Run(FileErrorToBaseFileError(error), base::File::Info());
|
| return;
|
| @@ -72,7 +72,7 @@ void RunGetFileInfoCallback(const GetFileInfoCallback& callback,
|
| // Runs |callback| with entries.
|
| void RunReadDirectoryCallbackWithEntries(
|
| const ReadDirectoryCallback& callback,
|
| - scoped_ptr<ResourceEntryVector> resource_entries) {
|
| + std::unique_ptr<ResourceEntryVector> resource_entries) {
|
| DCHECK(resource_entries);
|
|
|
| std::vector<storage::DirectoryEntry> entries;
|
| @@ -103,7 +103,7 @@ void RunReadDirectoryCallbackOnCompletion(const ReadDirectoryCallback& callback,
|
| void RunCreateSnapshotFileCallback(const CreateSnapshotFileCallback& callback,
|
| FileError error,
|
| const base::FilePath& local_path,
|
| - scoped_ptr<ResourceEntry> entry) {
|
| + std::unique_ptr<ResourceEntry> entry) {
|
| if (error != FILE_ERROR_OK) {
|
| callback.Run(FileErrorToBaseFileError(error),
|
| base::File::Info(),
|
|
|