OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "google_apis/drive/files_list_request_runner.h" | 5 #include "google_apis/drive/files_list_request_runner.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 : request_sender_(request_sender), | 22 : request_sender_(request_sender), |
23 url_generator_(url_generator), | 23 url_generator_(url_generator), |
24 weak_ptr_factory_(this) { | 24 weak_ptr_factory_(this) { |
25 } | 25 } |
26 | 26 |
27 FilesListRequestRunner::~FilesListRequestRunner() { | 27 FilesListRequestRunner::~FilesListRequestRunner() { |
28 } | 28 } |
29 | 29 |
30 CancelCallback FilesListRequestRunner::CreateAndStartWithSizeBackoff( | 30 CancelCallback FilesListRequestRunner::CreateAndStartWithSizeBackoff( |
31 int max_results, | 31 int max_results, |
| 32 const FilesListScope& scope, |
32 const std::string& q, | 33 const std::string& q, |
33 const std::string& fields, | 34 const std::string& fields, |
34 const FileListCallback& callback) { | 35 const FileListCallback& callback) { |
35 UMA_HISTOGRAM_COUNTS_1000("Drive.FilesListRequestRunner.MaxResults", | 36 UMA_HISTOGRAM_COUNTS_1000("Drive.FilesListRequestRunner.MaxResults", |
36 max_results); | 37 max_results); |
37 base::Closure* const cancel_callback = new base::Closure; | 38 base::Closure* const cancel_callback = new base::Closure; |
38 std::unique_ptr<drive::FilesListRequest> request = | 39 std::unique_ptr<drive::FilesListRequest> request = |
39 base::MakeUnique<drive::FilesListRequest>( | 40 base::MakeUnique<drive::FilesListRequest>( |
40 request_sender_, url_generator_, | 41 request_sender_, url_generator_, |
41 base::Bind(&FilesListRequestRunner::OnCompleted, | 42 base::Bind(&FilesListRequestRunner::OnCompleted, |
42 weak_ptr_factory_.GetWeakPtr(), max_results, q, fields, | 43 weak_ptr_factory_.GetWeakPtr(), max_results, scope, q, |
43 callback, base::Owned(cancel_callback))); | 44 fields, callback, base::Owned(cancel_callback))); |
44 request->set_max_results(max_results); | 45 request->set_max_results(max_results); |
45 request->set_q(q); | 46 request->set_q(q); |
46 request->set_fields(fields); | 47 request->set_fields(fields); |
47 *cancel_callback = | 48 *cancel_callback = |
48 request_sender_->StartRequestWithAuthRetry(std::move(request)); | 49 request_sender_->StartRequestWithAuthRetry(std::move(request)); |
49 | 50 |
50 // The cancellation callback is owned by the completion callback, so it must | 51 // The cancellation callback is owned by the completion callback, so it must |
51 // not be used after |callback| is called. | 52 // not be used after |callback| is called. |
52 return base::Bind(&FilesListRequestRunner::OnCancel, | 53 return base::Bind(&FilesListRequestRunner::OnCancel, |
53 weak_ptr_factory_.GetWeakPtr(), | 54 weak_ptr_factory_.GetWeakPtr(), |
54 base::Unretained(cancel_callback)); | 55 base::Unretained(cancel_callback)); |
55 } | 56 } |
56 | 57 |
57 void FilesListRequestRunner::OnCancel(base::Closure* cancel_callback) { | 58 void FilesListRequestRunner::OnCancel(base::Closure* cancel_callback) { |
58 DCHECK(cancel_callback); | 59 DCHECK(cancel_callback); |
59 DCHECK(!cancel_callback->is_null()); | 60 DCHECK(!cancel_callback->is_null()); |
60 cancel_callback->Run(); | 61 cancel_callback->Run(); |
61 } | 62 } |
62 | 63 |
63 void FilesListRequestRunner::OnCompleted(int max_results, | 64 void FilesListRequestRunner::OnCompleted(int max_results, |
| 65 const FilesListScope& scope, |
64 const std::string& q, | 66 const std::string& q, |
65 const std::string& fields, | 67 const std::string& fields, |
66 const FileListCallback& callback, | 68 const FileListCallback& callback, |
67 CancelCallback* cancel_callback, | 69 CancelCallback* cancel_callback, |
68 DriveApiErrorCode error, | 70 DriveApiErrorCode error, |
69 std::unique_ptr<FileList> entry) { | 71 std::unique_ptr<FileList> entry) { |
70 if (!request_completed_callback_for_testing_.is_null()) | 72 if (!request_completed_callback_for_testing_.is_null()) |
71 request_completed_callback_for_testing_.Run(); | 73 request_completed_callback_for_testing_.Run(); |
72 | 74 |
73 UMA_HISTOGRAM_SPARSE_SLOWLY( | 75 UMA_HISTOGRAM_SPARSE_SLOWLY( |
74 "Drive.FilesListRequestRunner.ApiErrorCode", error); | 76 "Drive.FilesListRequestRunner.ApiErrorCode", error); |
75 | 77 |
76 if (error == google_apis::DRIVE_RESPONSE_TOO_LARGE && max_results > 1) { | 78 if (error == google_apis::DRIVE_RESPONSE_TOO_LARGE && max_results > 1) { |
77 CreateAndStartWithSizeBackoff(max_results / 2, q, fields, callback); | 79 CreateAndStartWithSizeBackoff(max_results / 2, scope, q, fields, callback); |
78 return; | 80 return; |
79 } | 81 } |
80 | 82 |
81 callback.Run(error, std::move(entry)); | 83 callback.Run(error, std::move(entry)); |
82 } | 84 } |
83 | 85 |
84 void FilesListRequestRunner::SetRequestCompletedCallbackForTesting( | 86 void FilesListRequestRunner::SetRequestCompletedCallbackForTesting( |
85 const base::Closure& callback) { | 87 const base::Closure& callback) { |
86 request_completed_callback_for_testing_ = callback; | 88 request_completed_callback_for_testing_ = callback; |
87 } | 89 } |
88 | 90 |
89 } // namespace google_apis | 91 } // namespace google_apis |
OLD | NEW |