Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4369)

Unified Diff: chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
diff --git a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
index 22fb9bc601511a874c762fcde90eaf1a5c4854a6..d4c4483cc3828fa926292bafdda46e77baf88493 100644
--- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
+++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
+#include <memory>
+
#include "base/bind.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/drive/fileapi/async_file_util.h"
#include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
@@ -30,7 +31,7 @@ namespace {
void GetRedirectURLForContentsOnUIThreadWithResourceEntry(
const storage::URLCallback& callback,
FileError error,
- scoped_ptr<ResourceEntry> entry) {
+ std::unique_ptr<ResourceEntry> entry) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
GURL url;
if (error == FILE_ERROR_OK && entry->has_file_specific_info() &&
@@ -84,7 +85,7 @@ storage::AsyncFileUtil* FileSystemBackendDelegate::GetAsyncFileUtil(
return async_file_util_.get();
}
-scoped_ptr<storage::FileStreamReader>
+std::unique_ptr<storage::FileStreamReader>
FileSystemBackendDelegate::CreateFileStreamReader(
const storage::FileSystemURL& url,
int64_t offset,
@@ -96,18 +97,16 @@ FileSystemBackendDelegate::CreateFileStreamReader(
base::FilePath file_path = util::ExtractDrivePathFromFileSystemUrl(url);
if (file_path.empty())
- return scoped_ptr<storage::FileStreamReader>();
+ return std::unique_ptr<storage::FileStreamReader>();
- return scoped_ptr<storage::FileStreamReader>(
+ return std::unique_ptr<storage::FileStreamReader>(
new internal::WebkitFileStreamReaderImpl(
base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
- context->default_file_task_runner(),
- file_path,
- offset,
+ context->default_file_task_runner(), file_path, offset,
expected_modification_time));
}
-scoped_ptr<storage::FileStreamWriter>
+std::unique_ptr<storage::FileStreamWriter>
FileSystemBackendDelegate::CreateFileStreamWriter(
const storage::FileSystemURL& url,
int64_t offset,
@@ -118,14 +117,12 @@ FileSystemBackendDelegate::CreateFileStreamWriter(
base::FilePath file_path = util::ExtractDrivePathFromFileSystemUrl(url);
// Hosted documents don't support stream writer.
if (file_path.empty() || util::HasHostedDocumentExtension(file_path))
- return scoped_ptr<storage::FileStreamWriter>();
+ return std::unique_ptr<storage::FileStreamWriter>();
- return scoped_ptr<storage::FileStreamWriter>(
+ return std::unique_ptr<storage::FileStreamWriter>(
new internal::WebkitFileStreamWriterImpl(
base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
- context->default_file_task_runner(),
- file_path,
- offset));
+ context->default_file_task_runner(), file_path, offset));
}
storage::WatcherManager* FileSystemBackendDelegate::GetWatcherManager(

Powered by Google App Engine
This is Rietveld 408576698