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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc

Issue 506793002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/sync_file_system/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/sync_file_system/drive_backend/drive_service_on_worker. h" 5 #include "chrome/browser/sync_file_system/drive_backend/drive_service_on_worker. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 26 matching lines...) Expand all
37 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 37 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
38 38
39 ui_task_runner_->PostTask( 39 ui_task_runner_->PostTask(
40 FROM_HERE, 40 FROM_HERE,
41 base::Bind(&DriveServiceWrapper::AddNewDirectory, 41 base::Bind(&DriveServiceWrapper::AddNewDirectory,
42 wrapper_, 42 wrapper_,
43 parent_resource_id, 43 parent_resource_id,
44 directory_title, 44 directory_title,
45 options, 45 options,
46 RelayCallbackToTaskRunner( 46 RelayCallbackToTaskRunner(
47 worker_task_runner_, 47 worker_task_runner_.get(), FROM_HERE, callback)));
48 FROM_HERE,
49 callback)));
50 48
51 return google_apis::CancelCallback(); 49 return google_apis::CancelCallback();
52 } 50 }
53 51
54 google_apis::CancelCallback DriveServiceOnWorker::DeleteResource( 52 google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
55 const std::string& resource_id, 53 const std::string& resource_id,
56 const std::string& etag, 54 const std::string& etag,
57 const google_apis::EntryActionCallback& callback) { 55 const google_apis::EntryActionCallback& callback) {
58 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 56 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
59 57
60 ui_task_runner_->PostTask( 58 ui_task_runner_->PostTask(
61 FROM_HERE, 59 FROM_HERE,
62 base::Bind(&DriveServiceWrapper::DeleteResource, 60 base::Bind(&DriveServiceWrapper::DeleteResource,
63 wrapper_, 61 wrapper_,
64 resource_id, 62 resource_id,
65 etag, 63 etag,
66 RelayCallbackToTaskRunner( 64 RelayCallbackToTaskRunner(
67 worker_task_runner_, 65 worker_task_runner_.get(), FROM_HERE, callback)));
68 FROM_HERE,
69 callback)));
70 66
71 return google_apis::CancelCallback(); 67 return google_apis::CancelCallback();
72 } 68 }
73 69
74 google_apis::CancelCallback DriveServiceOnWorker::DownloadFile( 70 google_apis::CancelCallback DriveServiceOnWorker::DownloadFile(
75 const base::FilePath& local_cache_path, 71 const base::FilePath& local_cache_path,
76 const std::string& resource_id, 72 const std::string& resource_id,
77 const google_apis::DownloadActionCallback& download_action_callback, 73 const google_apis::DownloadActionCallback& download_action_callback,
78 const google_apis::GetContentCallback& get_content_callback, 74 const google_apis::GetContentCallback& get_content_callback,
79 const google_apis::ProgressCallback& progress_callback) { 75 const google_apis::ProgressCallback& progress_callback) {
80 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 76 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
81 77
82 ui_task_runner_->PostTask( 78 ui_task_runner_->PostTask(
83 FROM_HERE, 79 FROM_HERE,
84 base::Bind(&DriveServiceWrapper::DownloadFile, 80 base::Bind(
85 wrapper_, 81 &DriveServiceWrapper::DownloadFile,
86 local_cache_path, 82 wrapper_,
87 resource_id, 83 local_cache_path,
88 RelayCallbackToTaskRunner( 84 resource_id,
89 worker_task_runner_, 85 RelayCallbackToTaskRunner(
90 FROM_HERE, 86 worker_task_runner_.get(), FROM_HERE, download_action_callback),
91 download_action_callback), 87 RelayCallbackToTaskRunner(
92 RelayCallbackToTaskRunner( 88 worker_task_runner_.get(), FROM_HERE, get_content_callback),
93 worker_task_runner_, 89 RelayCallbackToTaskRunner(
94 FROM_HERE, 90 worker_task_runner_.get(), FROM_HERE, progress_callback)));
95 get_content_callback),
96 RelayCallbackToTaskRunner(
97 worker_task_runner_,
98 FROM_HERE,
99 progress_callback)));
100 91
101 return google_apis::CancelCallback(); 92 return google_apis::CancelCallback();
102 } 93 }
103 94
104 google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource( 95 google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource(
105 const google_apis::AboutResourceCallback& callback) { 96 const google_apis::AboutResourceCallback& callback) {
106 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 97 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
107 98
108 ui_task_runner_->PostTask( 99 ui_task_runner_->PostTask(
109 FROM_HERE, 100 FROM_HERE,
110 base::Bind(&DriveServiceWrapper::GetAboutResource, 101 base::Bind(&DriveServiceWrapper::GetAboutResource,
111 wrapper_, 102 wrapper_,
112 RelayCallbackToTaskRunner( 103 RelayCallbackToTaskRunner(
113 worker_task_runner_, 104 worker_task_runner_.get(), FROM_HERE, callback)));
114 FROM_HERE,
115 callback)));
116 105
117 return google_apis::CancelCallback(); 106 return google_apis::CancelCallback();
118 } 107 }
119 108
120 google_apis::CancelCallback DriveServiceOnWorker::GetChangeList( 109 google_apis::CancelCallback DriveServiceOnWorker::GetChangeList(
121 int64 start_changestamp, 110 int64 start_changestamp,
122 const google_apis::ChangeListCallback& callback) { 111 const google_apis::ChangeListCallback& callback) {
123 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 112 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
124 113
125 ui_task_runner_->PostTask( 114 ui_task_runner_->PostTask(
126 FROM_HERE, 115 FROM_HERE,
127 base::Bind(&DriveServiceWrapper::GetChangeList, 116 base::Bind(&DriveServiceWrapper::GetChangeList,
128 wrapper_, 117 wrapper_,
129 start_changestamp, 118 start_changestamp,
130 RelayCallbackToTaskRunner( 119 RelayCallbackToTaskRunner(
131 worker_task_runner_, 120 worker_task_runner_.get(), FROM_HERE, callback)));
132 FROM_HERE,
133 callback)));
134 121
135 return google_apis::CancelCallback(); 122 return google_apis::CancelCallback();
136 } 123 }
137 124
138 google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList( 125 google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
139 const GURL& next_link, 126 const GURL& next_link,
140 const google_apis::ChangeListCallback& callback) { 127 const google_apis::ChangeListCallback& callback) {
141 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 128 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
142 129
143 ui_task_runner_->PostTask( 130 ui_task_runner_->PostTask(
144 FROM_HERE, 131 FROM_HERE,
145 base::Bind(&DriveServiceWrapper::GetRemainingChangeList, 132 base::Bind(&DriveServiceWrapper::GetRemainingChangeList,
146 wrapper_, 133 wrapper_,
147 next_link, 134 next_link,
148 RelayCallbackToTaskRunner( 135 RelayCallbackToTaskRunner(
149 worker_task_runner_, 136 worker_task_runner_.get(), FROM_HERE, callback)));
150 FROM_HERE,
151 callback)));
152 137
153 return google_apis::CancelCallback(); 138 return google_apis::CancelCallback();
154 } 139 }
155 140
156 std::string DriveServiceOnWorker::GetRootResourceId() const { 141 std::string DriveServiceOnWorker::GetRootResourceId() const {
157 NOTREACHED(); 142 NOTREACHED();
158 // This method is expected to be called only on unit tests. 143 // This method is expected to be called only on unit tests.
159 return "root"; 144 return "root";
160 } 145 }
161 146
162 google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList( 147 google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
163 const GURL& next_link, 148 const GURL& next_link,
164 const google_apis::FileListCallback& callback) { 149 const google_apis::FileListCallback& callback) {
165 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 150 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
166 151
167 ui_task_runner_->PostTask( 152 ui_task_runner_->PostTask(
168 FROM_HERE, 153 FROM_HERE,
169 base::Bind(&DriveServiceWrapper::GetRemainingFileList, 154 base::Bind(&DriveServiceWrapper::GetRemainingFileList,
170 wrapper_, 155 wrapper_,
171 next_link, 156 next_link,
172 RelayCallbackToTaskRunner( 157 RelayCallbackToTaskRunner(
173 worker_task_runner_, 158 worker_task_runner_.get(), FROM_HERE, callback)));
174 FROM_HERE,
175 callback)));
176 159
177 return google_apis::CancelCallback(); 160 return google_apis::CancelCallback();
178 } 161 }
179 162
180 163
181 google_apis::CancelCallback DriveServiceOnWorker::GetFileResource( 164 google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
182 const std::string& resource_id, 165 const std::string& resource_id,
183 const google_apis::FileResourceCallback& callback) { 166 const google_apis::FileResourceCallback& callback) {
184 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 167 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
185 168
186 ui_task_runner_->PostTask( 169 ui_task_runner_->PostTask(
187 FROM_HERE, 170 FROM_HERE,
188 base::Bind(&DriveServiceWrapper::GetFileResource, 171 base::Bind(&DriveServiceWrapper::GetFileResource,
189 wrapper_, 172 wrapper_,
190 resource_id, 173 resource_id,
191 RelayCallbackToTaskRunner( 174 RelayCallbackToTaskRunner(
192 worker_task_runner_, 175 worker_task_runner_.get(), FROM_HERE, callback)));
193 FROM_HERE,
194 callback)));
195 176
196 return google_apis::CancelCallback(); 177 return google_apis::CancelCallback();
197 } 178 }
198 179
199 google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory( 180 google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
200 const std::string& directory_resource_id, 181 const std::string& directory_resource_id,
201 const google_apis::FileListCallback& callback) { 182 const google_apis::FileListCallback& callback) {
202 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 183 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
203 184
204 ui_task_runner_->PostTask( 185 ui_task_runner_->PostTask(
205 FROM_HERE, 186 FROM_HERE,
206 base::Bind(&DriveServiceWrapper::GetFileListInDirectory, 187 base::Bind(&DriveServiceWrapper::GetFileListInDirectory,
207 wrapper_, 188 wrapper_,
208 directory_resource_id, 189 directory_resource_id,
209 RelayCallbackToTaskRunner( 190 RelayCallbackToTaskRunner(
210 worker_task_runner_, 191 worker_task_runner_.get(), FROM_HERE, callback)));
211 FROM_HERE,
212 callback)));
213 192
214 return google_apis::CancelCallback(); 193 return google_apis::CancelCallback();
215 } 194 }
216 195
217 google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory( 196 google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
218 const std::string& parent_resource_id, 197 const std::string& parent_resource_id,
219 const std::string& resource_id, 198 const std::string& resource_id,
220 const google_apis::EntryActionCallback& callback) { 199 const google_apis::EntryActionCallback& callback) {
221 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 200 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
222 201
223 ui_task_runner_->PostTask( 202 ui_task_runner_->PostTask(
224 FROM_HERE, 203 FROM_HERE,
225 base::Bind(&DriveServiceWrapper::RemoveResourceFromDirectory, 204 base::Bind(&DriveServiceWrapper::RemoveResourceFromDirectory,
226 wrapper_, 205 wrapper_,
227 parent_resource_id, 206 parent_resource_id,
228 resource_id, 207 resource_id,
229 RelayCallbackToTaskRunner( 208 RelayCallbackToTaskRunner(
230 worker_task_runner_, 209 worker_task_runner_.get(), FROM_HERE, callback)));
231 FROM_HERE,
232 callback)));
233 210
234 return google_apis::CancelCallback(); 211 return google_apis::CancelCallback();
235 } 212 }
236 213
237 google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle( 214 google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
238 const std::string& title, 215 const std::string& title,
239 const std::string& directory_resource_id, 216 const std::string& directory_resource_id,
240 const google_apis::FileListCallback& callback) { 217 const google_apis::FileListCallback& callback) {
241 DCHECK(sequence_checker_.CalledOnValidSequencedThread()); 218 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
242 219
243 ui_task_runner_->PostTask( 220 ui_task_runner_->PostTask(
244 FROM_HERE, 221 FROM_HERE,
245 base::Bind(&DriveServiceWrapper::SearchByTitle, 222 base::Bind(&DriveServiceWrapper::SearchByTitle,
246 wrapper_, 223 wrapper_,
247 title, 224 title,
248 directory_resource_id, 225 directory_resource_id,
249 RelayCallbackToTaskRunner( 226 RelayCallbackToTaskRunner(
250 worker_task_runner_, 227 worker_task_runner_.get(), FROM_HERE, callback)));
251 FROM_HERE,
252 callback)));
253 228
254 return google_apis::CancelCallback(); 229 return google_apis::CancelCallback();
255 } 230 }
256 231
257 bool DriveServiceOnWorker::HasRefreshToken() const { 232 bool DriveServiceOnWorker::HasRefreshToken() const {
258 NOTREACHED(); 233 NOTREACHED();
259 return false; 234 return false;
260 } 235 }
261 236
262 void DriveServiceOnWorker::Initialize(const std::string& account_id) { 237 void DriveServiceOnWorker::Initialize(const std::string& account_id) {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 const std::string& resource_id, 394 const std::string& resource_id,
420 const std::string& email, 395 const std::string& email,
421 google_apis::drive::PermissionRole role, 396 google_apis::drive::PermissionRole role,
422 const google_apis::EntryActionCallback& callback) { 397 const google_apis::EntryActionCallback& callback) {
423 NOTREACHED(); 398 NOTREACHED();
424 return google_apis::CancelCallback(); 399 return google_apis::CancelCallback();
425 } 400 }
426 401
427 } // namespace drive_backend 402 } // namespace drive_backend
428 } // namespace sync_file_system 403 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698