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

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/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/file_system_provider/fileapi/backend_delegate.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
index c5df3a7203a0b054ec80d1533e7653ae10eb7ed4..61085739cdd558f8e304ff7d1a5831a73b2000ed 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
@@ -4,7 +4,8 @@
#include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h"
#include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.h"
#include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h"
@@ -46,7 +47,8 @@ storage::AsyncFileUtil* BackendDelegate::GetAsyncFileUtil(
return async_file_util_.get();
}
-scoped_ptr<storage::FileStreamReader> BackendDelegate::CreateFileStreamReader(
+std::unique_ptr<storage::FileStreamReader>
+BackendDelegate::CreateFileStreamReader(
const storage::FileSystemURL& url,
int64_t offset,
int64_t max_bytes_to_read,
@@ -55,23 +57,24 @@ scoped_ptr<storage::FileStreamReader> BackendDelegate::CreateFileStreamReader(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
- return scoped_ptr<storage::FileStreamReader>(new BufferingFileStreamReader(
- scoped_ptr<storage::FileStreamReader>(new FileStreamReader(
- context, url, offset, expected_modification_time)),
- kReaderBufferSize,
- max_bytes_to_read));
+ return std::unique_ptr<storage::FileStreamReader>(
+ new BufferingFileStreamReader(
+ std::unique_ptr<storage::FileStreamReader>(new FileStreamReader(
+ context, url, offset, expected_modification_time)),
+ kReaderBufferSize, max_bytes_to_read));
}
-scoped_ptr<storage::FileStreamWriter> BackendDelegate::CreateFileStreamWriter(
- const storage::FileSystemURL& url,
- int64_t offset,
- storage::FileSystemContext* context) {
+std::unique_ptr<storage::FileStreamWriter>
+BackendDelegate::CreateFileStreamWriter(const storage::FileSystemURL& url,
+ int64_t offset,
+ storage::FileSystemContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
- return scoped_ptr<storage::FileStreamWriter>(new BufferingFileStreamWriter(
- scoped_ptr<storage::FileStreamWriter>(new FileStreamWriter(url, offset)),
- kWriterBufferSize));
+ return std::unique_ptr<storage::FileStreamWriter>(
+ new BufferingFileStreamWriter(std::unique_ptr<storage::FileStreamWriter>(
+ new FileStreamWriter(url, offset)),
+ kWriterBufferSize));
}
storage::WatcherManager* BackendDelegate::GetWatcherManager(

Powered by Google App Engine
This is Rietveld 408576698