| Index: chrome/browser/chromeos/file_manager/filesystem_api_util.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
|
| index 231fbd163e475e83d9a21922d7560dc0c9e28c2e..ff80ebb413c12bbf51ad12aba59acef21a8adda8 100644
|
| --- a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
|
| +++ b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
|
| @@ -4,10 +4,11 @@
|
|
|
| #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/files/file.h"
|
| #include "base/files/file_path.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/chromeos/drive/file_system_util.h"
|
| #include "chrome/browser/chromeos/file_manager/app_id.h"
|
| #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
|
| @@ -32,7 +33,7 @@ namespace {
|
| void GetMimeTypeAfterGetResourceEntryForDrive(
|
| const base::Callback<void(bool, const std::string&)>& callback,
|
| drive::FileError error,
|
| - scoped_ptr<drive::ResourceEntry> entry) {
|
| + std::unique_ptr<drive::ResourceEntry> entry) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| if (error != drive::FILE_ERROR_OK || !entry->has_file_specific_info() ||
|
| @@ -47,7 +48,7 @@ void GetMimeTypeAfterGetResourceEntryForDrive(
|
| // the mime type from the passed metadata from a providing extension.
|
| void GetMimeTypeAfterGetMetadataForProvidedFileSystem(
|
| const base::Callback<void(bool, const std::string&)>& callback,
|
| - scoped_ptr<chromeos::file_system_provider::EntryMetadata> metadata,
|
| + std::unique_ptr<chromeos::file_system_provider::EntryMetadata> metadata,
|
| base::File::Error result) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
|