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

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.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/file_stream_reader.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
index a966ee09f25d6f2f5a09b2d5c9b5c6b1754fac75..855651e07df6c0ea0734a811abbceffbcd2a0c16 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
@@ -6,6 +6,7 @@
#include "base/files/file.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/trace_event/trace_event.h"
#include "chrome/browser/chromeos/file_system_provider/abort_callback.h"
@@ -101,10 +102,9 @@ class FileStreamReader::OperationRunner
// If the file system got unmounted, then abort the get length operation.
if (!file_system_.get()) {
BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
+ BrowserThread::IO, FROM_HERE,
base::Bind(callback,
- base::Passed(make_scoped_ptr<EntryMetadata>(NULL)),
+ base::Passed(base::WrapUnique<EntryMetadata>(NULL)),
base::File::FILE_ERROR_ABORT));
return;
}
@@ -158,7 +158,7 @@ class FileStreamReader::OperationRunner
// Forwards a metadata to the IO thread.
void OnGetMetadataCompletedOnUIThread(
const ProvidedFileSystemInterface::GetMetadataCallback& callback,
- scoped_ptr<EntryMetadata> metadata,
+ std::unique_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
abort_callback_ = AbortCallback();
@@ -189,7 +189,7 @@ class FileStreamReader::OperationRunner
AbortCallback abort_callback_;
base::WeakPtr<ProvidedFileSystemInterface> file_system_;
base::FilePath file_path_;
- scoped_ptr<ScopedFileOpener> file_opener_;
+ std::unique_ptr<ScopedFileOpener> file_opener_;
int file_handle_;
DISALLOW_COPY_AND_ASSIGN(OperationRunner);
@@ -270,7 +270,7 @@ void FileStreamReader::OnOpenFileCompleted(
void FileStreamReader::OnInitializeCompleted(
const base::Closure& pending_closure,
const net::Int64CompletionCallback& error_callback,
- scoped_ptr<EntryMetadata> metadata,
+ std::unique_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(INITIALIZING, state_);
@@ -450,7 +450,7 @@ void FileStreamReader::OnReadChunkReceived(
void FileStreamReader::OnGetMetadataForGetLengthReceived(
const net::Int64CompletionCallback& callback,
- scoped_ptr<EntryMetadata> metadata,
+ std::unique_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(INITIALIZED, state_);

Powered by Google App Engine
This is Rietveld 408576698