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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_channel_id_helper.cc

Issue 2826783003: Rewrite base::Bind to base::BindOnce with base_bind_rewriters in //chrome/browser/browsing_data (Closed)
Patch Set: Created 3 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/browsing_data/browsing_data_channel_id_helper.h" 5 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 BrowsingDataChannelIDHelperImpl:: 61 BrowsingDataChannelIDHelperImpl::
62 ~BrowsingDataChannelIDHelperImpl() { 62 ~BrowsingDataChannelIDHelperImpl() {
63 } 63 }
64 64
65 void BrowsingDataChannelIDHelperImpl::StartFetching( 65 void BrowsingDataChannelIDHelperImpl::StartFetching(
66 const FetchResultCallback& callback) { 66 const FetchResultCallback& callback) {
67 DCHECK_CURRENTLY_ON(BrowserThread::UI); 67 DCHECK_CURRENTLY_ON(BrowserThread::UI);
68 DCHECK(!callback.is_null()); 68 DCHECK(!callback.is_null());
69 BrowserThread::PostTask( 69 BrowserThread::PostTask(
70 BrowserThread::IO, FROM_HERE, 70 BrowserThread::IO, FROM_HERE,
71 base::Bind(&BrowsingDataChannelIDHelperImpl::FetchOnIOThread, this, 71 base::BindOnce(&BrowsingDataChannelIDHelperImpl::FetchOnIOThread, this,
72 callback)); 72 callback));
73 } 73 }
74 74
75 void BrowsingDataChannelIDHelperImpl::DeleteChannelID( 75 void BrowsingDataChannelIDHelperImpl::DeleteChannelID(
76 const std::string& server_id) { 76 const std::string& server_id) {
77 DCHECK_CURRENTLY_ON(BrowserThread::UI); 77 DCHECK_CURRENTLY_ON(BrowserThread::UI);
78 BrowserThread::PostTask( 78 BrowserThread::PostTask(
79 BrowserThread::IO, 79 BrowserThread::IO, FROM_HERE,
80 FROM_HERE, 80 base::BindOnce(&BrowsingDataChannelIDHelperImpl::DeleteOnIOThread, this,
81 base::Bind( 81 server_id));
82 &BrowsingDataChannelIDHelperImpl::DeleteOnIOThread, this, server_id));
83 } 82 }
84 83
85 void BrowsingDataChannelIDHelperImpl::FetchOnIOThread( 84 void BrowsingDataChannelIDHelperImpl::FetchOnIOThread(
86 const FetchResultCallback& callback) { 85 const FetchResultCallback& callback) {
87 DCHECK_CURRENTLY_ON(BrowserThread::IO); 86 DCHECK_CURRENTLY_ON(BrowserThread::IO);
88 DCHECK(!callback.is_null()); 87 DCHECK(!callback.is_null());
89 88
90 net::ChannelIDStore* cert_store = 89 net::ChannelIDStore* cert_store =
91 request_context_getter_->GetURLRequestContext()-> 90 request_context_getter_->GetURLRequestContext()->
92 channel_id_service()->GetChannelIDStore(); 91 channel_id_service()->GetChannelIDStore();
93 if (cert_store) { 92 if (cert_store) {
94 cert_store->GetAllChannelIDs(base::Bind( 93 cert_store->GetAllChannelIDs(base::Bind(
95 &BrowsingDataChannelIDHelperImpl::OnFetchComplete, this, callback)); 94 &BrowsingDataChannelIDHelperImpl::OnFetchComplete, this, callback));
96 } else { 95 } else {
97 OnFetchComplete(callback, net::ChannelIDStore::ChannelIDList()); 96 OnFetchComplete(callback, net::ChannelIDStore::ChannelIDList());
98 } 97 }
99 } 98 }
100 99
101 void BrowsingDataChannelIDHelperImpl::OnFetchComplete( 100 void BrowsingDataChannelIDHelperImpl::OnFetchComplete(
102 const FetchResultCallback& callback, 101 const FetchResultCallback& callback,
103 const net::ChannelIDStore::ChannelIDList& channel_id_list) { 102 const net::ChannelIDStore::ChannelIDList& channel_id_list) {
104 DCHECK_CURRENTLY_ON(BrowserThread::IO); 103 DCHECK_CURRENTLY_ON(BrowserThread::IO);
105 DCHECK(!callback.is_null()); 104 DCHECK(!callback.is_null());
106 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 105 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
107 base::Bind(callback, channel_id_list)); 106 base::BindOnce(callback, channel_id_list));
108 } 107 }
109 108
110 void BrowsingDataChannelIDHelperImpl::DeleteOnIOThread( 109 void BrowsingDataChannelIDHelperImpl::DeleteOnIOThread(
111 const std::string& server_id) { 110 const std::string& server_id) {
112 DCHECK_CURRENTLY_ON(BrowserThread::IO); 111 DCHECK_CURRENTLY_ON(BrowserThread::IO);
113 net::ChannelIDStore* cert_store = 112 net::ChannelIDStore* cert_store =
114 request_context_getter_->GetURLRequestContext()-> 113 request_context_getter_->GetURLRequestContext()->
115 channel_id_service()->GetChannelIDStore(); 114 channel_id_service()->GetChannelIDStore();
116 if (cert_store) { 115 if (cert_store) {
117 cert_store->DeleteChannelID( 116 cert_store->DeleteChannelID(
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 return channel_id_map_.size(); 164 return channel_id_map_.size();
166 } 165 }
167 166
168 void CannedBrowsingDataChannelIDHelper::StartFetching( 167 void CannedBrowsingDataChannelIDHelper::StartFetching(
169 const FetchResultCallback& callback) { 168 const FetchResultCallback& callback) {
170 DCHECK_CURRENTLY_ON(BrowserThread::UI); 169 DCHECK_CURRENTLY_ON(BrowserThread::UI);
171 if (callback.is_null()) 170 if (callback.is_null())
172 return; 171 return;
173 // We post a task to emulate async fetching behavior. 172 // We post a task to emulate async fetching behavior.
174 base::ThreadTaskRunnerHandle::Get()->PostTask( 173 base::ThreadTaskRunnerHandle::Get()->PostTask(
175 FROM_HERE, base::Bind(&CannedBrowsingDataChannelIDHelper::FinishFetching, 174 FROM_HERE,
176 this, callback)); 175 base::BindOnce(&CannedBrowsingDataChannelIDHelper::FinishFetching, this,
176 callback));
177 } 177 }
178 178
179 void CannedBrowsingDataChannelIDHelper::FinishFetching( 179 void CannedBrowsingDataChannelIDHelper::FinishFetching(
180 const FetchResultCallback& callback) { 180 const FetchResultCallback& callback) {
181 DCHECK_CURRENTLY_ON(BrowserThread::UI); 181 DCHECK_CURRENTLY_ON(BrowserThread::UI);
182 DCHECK(!callback.is_null()); 182 DCHECK(!callback.is_null());
183 net::ChannelIDStore::ChannelIDList channel_id_list; 183 net::ChannelIDStore::ChannelIDList channel_id_list;
184 for (const auto& pair : channel_id_map_) 184 for (const auto& pair : channel_id_map_)
185 channel_id_list.push_back(pair.second); 185 channel_id_list.push_back(pair.second);
186 callback.Run(channel_id_list); 186 callback.Run(channel_id_list);
187 } 187 }
188 188
189 void CannedBrowsingDataChannelIDHelper::DeleteChannelID( 189 void CannedBrowsingDataChannelIDHelper::DeleteChannelID(
190 const std::string& server_id) { 190 const std::string& server_id) {
191 NOTREACHED(); 191 NOTREACHED();
192 } 192 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698