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

Unified Diff: chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h

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/webkit_file_stream_reader_impl.h
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h
index 6a56ced1e92475b263245c561415981e14cf5355..71554b41a563b10d83578e69803635eaa52f363a 100644
--- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h
+++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h
@@ -7,10 +7,11 @@
#include <stdint.h>
+#include <memory>
+
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/drive/drive_file_stream_reader.h"
@@ -52,10 +53,9 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader {
// Called upon the initialization completion of |stream_reader_|.
// Processes the result of the initialization with checking last
// modified time, and calls |callback| with net::Error code as its result.
- void OnStreamReaderInitialized(
- const net::CompletionCallback& callback,
- int error,
- scoped_ptr<ResourceEntry> entry);
+ void OnStreamReaderInitialized(const net::CompletionCallback& callback,
+ int error,
+ std::unique_ptr<ResourceEntry> entry);
// Part of Read(). Called after all the initialization process is completed.
void ReadAfterStreamReaderInitialized(
@@ -70,7 +70,7 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader {
const net::Int64CompletionCallback& callback,
int initialization_result);
- scoped_ptr<DriveFileStreamReader> stream_reader_;
+ std::unique_ptr<DriveFileStreamReader> stream_reader_;
const base::FilePath drive_file_path_;
const int64_t offset_;
const base::Time expected_modification_time_;

Powered by Google App Engine
This is Rietveld 408576698