Index: chrome/browser/chromeos/fileapi/external_file_url_request_job.h |
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h |
index 04dd0d4a2d48cef4774f4aa951331fb4ac50a750..61b6dd46db32be2dd1f0438d71f672d55ccf78ae 100644 |
--- a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h |
+++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h |
@@ -51,9 +51,10 @@ class ExternalFileURLRequestJob : public net::URLRequestJob { |
typedef base::Callback<void( |
net::Error, |
const scoped_refptr<storage::FileSystemContext>& file_system_context, |
- scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope, |
+ std::unique_ptr<IsolatedFileSystemScope> isolated_file_system_scope, |
const storage::FileSystemURL& file_system_url, |
- const std::string& mime_type)> HelperCallback; |
+ const std::string& mime_type)> |
+ HelperCallback; |
ExternalFileURLRequestJob(void* profile_id, |
net::URLRequest* request, |
@@ -81,7 +82,7 @@ class ExternalFileURLRequestJob : public net::URLRequestJob { |
void OnHelperResultObtained( |
net::Error error, |
const scoped_refptr<storage::FileSystemContext>& file_system_context, |
- scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope, |
+ std::unique_ptr<IsolatedFileSystemScope> isolated_file_system_scope, |
const storage::FileSystemURL& file_system_url, |
const std::string& mime_type); |
@@ -103,10 +104,10 @@ class ExternalFileURLRequestJob : public net::URLRequestJob { |
int64_t remaining_bytes_; |
scoped_refptr<storage::FileSystemContext> file_system_context_; |
- scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope_; |
+ std::unique_ptr<IsolatedFileSystemScope> isolated_file_system_scope_; |
storage::FileSystemURL file_system_url_; |
std::string mime_type_; |
- scoped_ptr<storage::FileStreamReader> stream_reader_; |
+ std::unique_ptr<storage::FileStreamReader> stream_reader_; |
GURL redirect_url_; |
// This should remain the last member so it'll be destroyed first and |