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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 5 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include <memory>
8
8 #include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_st ream_reader.h" 9 #include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_st ream_reader.h"
9 #include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_st ream_writer.h" 10 #include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_st ream_writer.h"
10 #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reade r.h" 11 #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reade r.h"
11 #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_write r.h" 12 #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_write r.h"
12 #include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_fi le_util.h" 13 #include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_fi le_util.h"
13 #include "chrome/browser/chromeos/file_system_provider/fileapi/watcher_manager.h " 14 #include "chrome/browser/chromeos/file_system_provider/fileapi/watcher_manager.h "
14 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
15 #include "storage/browser/fileapi/file_stream_reader.h" 16 #include "storage/browser/fileapi/file_stream_reader.h"
16 #include "storage/browser/fileapi/file_stream_writer.h" 17 #include "storage/browser/fileapi/file_stream_writer.h"
17 #include "storage/browser/fileapi/file_system_url.h" 18 #include "storage/browser/fileapi/file_system_url.h"
(...skipping 21 matching lines...) Expand all
39 40
40 BackendDelegate::~BackendDelegate() {} 41 BackendDelegate::~BackendDelegate() {}
41 42
42 storage::AsyncFileUtil* BackendDelegate::GetAsyncFileUtil( 43 storage::AsyncFileUtil* BackendDelegate::GetAsyncFileUtil(
43 storage::FileSystemType type) { 44 storage::FileSystemType type) {
44 DCHECK_CURRENTLY_ON(BrowserThread::IO); 45 DCHECK_CURRENTLY_ON(BrowserThread::IO);
45 DCHECK_EQ(storage::kFileSystemTypeProvided, type); 46 DCHECK_EQ(storage::kFileSystemTypeProvided, type);
46 return async_file_util_.get(); 47 return async_file_util_.get();
47 } 48 }
48 49
49 scoped_ptr<storage::FileStreamReader> BackendDelegate::CreateFileStreamReader( 50 std::unique_ptr<storage::FileStreamReader>
51 BackendDelegate::CreateFileStreamReader(
50 const storage::FileSystemURL& url, 52 const storage::FileSystemURL& url,
51 int64_t offset, 53 int64_t offset,
52 int64_t max_bytes_to_read, 54 int64_t max_bytes_to_read,
53 const base::Time& expected_modification_time, 55 const base::Time& expected_modification_time,
54 storage::FileSystemContext* context) { 56 storage::FileSystemContext* context) {
55 DCHECK_CURRENTLY_ON(BrowserThread::IO); 57 DCHECK_CURRENTLY_ON(BrowserThread::IO);
56 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type()); 58 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
57 59
58 return scoped_ptr<storage::FileStreamReader>(new BufferingFileStreamReader( 60 return std::unique_ptr<storage::FileStreamReader>(
59 scoped_ptr<storage::FileStreamReader>(new FileStreamReader( 61 new BufferingFileStreamReader(
60 context, url, offset, expected_modification_time)), 62 std::unique_ptr<storage::FileStreamReader>(new FileStreamReader(
61 kReaderBufferSize, 63 context, url, offset, expected_modification_time)),
62 max_bytes_to_read)); 64 kReaderBufferSize, max_bytes_to_read));
63 } 65 }
64 66
65 scoped_ptr<storage::FileStreamWriter> BackendDelegate::CreateFileStreamWriter( 67 std::unique_ptr<storage::FileStreamWriter>
66 const storage::FileSystemURL& url, 68 BackendDelegate::CreateFileStreamWriter(const storage::FileSystemURL& url,
67 int64_t offset, 69 int64_t offset,
68 storage::FileSystemContext* context) { 70 storage::FileSystemContext* context) {
69 DCHECK_CURRENTLY_ON(BrowserThread::IO); 71 DCHECK_CURRENTLY_ON(BrowserThread::IO);
70 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type()); 72 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
71 73
72 return scoped_ptr<storage::FileStreamWriter>(new BufferingFileStreamWriter( 74 return std::unique_ptr<storage::FileStreamWriter>(
73 scoped_ptr<storage::FileStreamWriter>(new FileStreamWriter(url, offset)), 75 new BufferingFileStreamWriter(std::unique_ptr<storage::FileStreamWriter>(
74 kWriterBufferSize)); 76 new FileStreamWriter(url, offset)),
77 kWriterBufferSize));
75 } 78 }
76 79
77 storage::WatcherManager* BackendDelegate::GetWatcherManager( 80 storage::WatcherManager* BackendDelegate::GetWatcherManager(
78 storage::FileSystemType type) { 81 storage::FileSystemType type) {
79 DCHECK_CURRENTLY_ON(BrowserThread::UI); 82 DCHECK_CURRENTLY_ON(BrowserThread::UI);
80 DCHECK_EQ(storage::kFileSystemTypeProvided, type); 83 DCHECK_EQ(storage::kFileSystemTypeProvided, type);
81 return watcher_manager_.get(); 84 return watcher_manager_.get();
82 } 85 }
83 86
84 void BackendDelegate::GetRedirectURLForContents( 87 void BackendDelegate::GetRedirectURLForContents(
85 const storage::FileSystemURL& url, 88 const storage::FileSystemURL& url,
86 const storage::URLCallback& callback) { 89 const storage::URLCallback& callback) {
87 DCHECK_CURRENTLY_ON(BrowserThread::IO); 90 DCHECK_CURRENTLY_ON(BrowserThread::IO);
88 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type()); 91 DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
89 callback.Run(GURL()); 92 callback.Run(GURL());
90 } 93 }
91 94
92 } // namespace file_system_provider 95 } // namespace file_system_provider
93 } // namespace chromeos 96 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698