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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_database_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_database_helper.h" 5 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
6 6
7 #include <tuple> 7 #include <tuple>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 BrowsingDataDatabaseHelper::~BrowsingDataDatabaseHelper() { 49 BrowsingDataDatabaseHelper::~BrowsingDataDatabaseHelper() {
50 } 50 }
51 51
52 void BrowsingDataDatabaseHelper::StartFetching(const FetchCallback& callback) { 52 void BrowsingDataDatabaseHelper::StartFetching(const FetchCallback& callback) {
53 DCHECK_CURRENTLY_ON(BrowserThread::UI); 53 DCHECK_CURRENTLY_ON(BrowserThread::UI);
54 DCHECK(!callback.is_null()); 54 DCHECK(!callback.is_null());
55 55
56 BrowserThread::PostTask( 56 BrowserThread::PostTask(
57 BrowserThread::FILE, FROM_HERE, 57 BrowserThread::FILE, FROM_HERE,
58 base::Bind(&BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread, 58 base::BindOnce(&BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread,
59 this, callback)); 59 this, callback));
60 } 60 }
61 61
62 void BrowsingDataDatabaseHelper::DeleteDatabase(const std::string& origin, 62 void BrowsingDataDatabaseHelper::DeleteDatabase(const std::string& origin,
63 const std::string& name) { 63 const std::string& name) {
64 DCHECK_CURRENTLY_ON(BrowserThread::UI); 64 DCHECK_CURRENTLY_ON(BrowserThread::UI);
65 BrowserThread::PostTask( 65 BrowserThread::PostTask(
66 BrowserThread::FILE, FROM_HERE, 66 BrowserThread::FILE, FROM_HERE,
67 base::Bind(&BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, this, 67 base::BindOnce(&BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread,
68 origin, name)); 68 this, origin, name));
69 } 69 }
70 70
71 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread( 71 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread(
72 const FetchCallback& callback) { 72 const FetchCallback& callback) {
73 DCHECK_CURRENTLY_ON(BrowserThread::FILE); 73 DCHECK_CURRENTLY_ON(BrowserThread::FILE);
74 DCHECK(!callback.is_null()); 74 DCHECK(!callback.is_null());
75 75
76 std::list<DatabaseInfo> result; 76 std::list<DatabaseInfo> result;
77 std::vector<storage::OriginInfo> origins_info; 77 std::vector<storage::OriginInfo> origins_info;
78 if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) { 78 if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) {
(...skipping 12 matching lines...) Expand all
91 result.push_back( 91 result.push_back(
92 DatabaseInfo(identifier, base::UTF16ToUTF8(db), 92 DatabaseInfo(identifier, base::UTF16ToUTF8(db),
93 base::UTF16ToUTF8(origin.GetDatabaseDescription(db)), 93 base::UTF16ToUTF8(origin.GetDatabaseDescription(db)),
94 file_info.size, file_info.last_modified)); 94 file_info.size, file_info.last_modified));
95 } 95 }
96 } 96 }
97 } 97 }
98 } 98 }
99 99
100 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 100 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
101 base::Bind(callback, result)); 101 base::BindOnce(callback, result));
102 } 102 }
103 103
104 void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread( 104 void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread(
105 const std::string& origin, 105 const std::string& origin,
106 const std::string& name) { 106 const std::string& name) {
107 DCHECK_CURRENTLY_ON(BrowserThread::FILE); 107 DCHECK_CURRENTLY_ON(BrowserThread::FILE);
108 if (!tracker_.get()) 108 if (!tracker_.get())
109 return; 109 return;
110 tracker_->DeleteDatabase(origin, base::UTF8ToUTF16(name), 110 tracker_->DeleteDatabase(origin, base::UTF8ToUTF16(name),
111 net::CompletionCallback()); 111 net::CompletionCallback());
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 std::list<DatabaseInfo> result; 170 std::list<DatabaseInfo> result;
171 for (const PendingDatabaseInfo& info : pending_database_info_) { 171 for (const PendingDatabaseInfo& info : pending_database_info_) {
172 DatabaseIdentifier identifier = 172 DatabaseIdentifier identifier =
173 DatabaseIdentifier::CreateFromOrigin(info.origin); 173 DatabaseIdentifier::CreateFromOrigin(info.origin);
174 174
175 result.push_back( 175 result.push_back(
176 DatabaseInfo(identifier, info.name, info.description, 0, base::Time())); 176 DatabaseInfo(identifier, info.name, info.description, 0, base::Time()));
177 } 177 }
178 178
179 BrowserThread::PostTask( 179 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
180 BrowserThread::UI, FROM_HERE, base::Bind(callback, result)); 180 base::BindOnce(callback, result));
181 } 181 }
182 182
183 void CannedBrowsingDataDatabaseHelper::DeleteDatabase( 183 void CannedBrowsingDataDatabaseHelper::DeleteDatabase(
184 const std::string& origin_identifier, 184 const std::string& origin_identifier,
185 const std::string& name) { 185 const std::string& name) {
186 GURL origin = 186 GURL origin =
187 storage::DatabaseIdentifier::Parse(origin_identifier).ToOrigin(); 187 storage::DatabaseIdentifier::Parse(origin_identifier).ToOrigin();
188 for (std::set<PendingDatabaseInfo>::iterator it = 188 for (std::set<PendingDatabaseInfo>::iterator it =
189 pending_database_info_.begin(); 189 pending_database_info_.begin();
190 it != pending_database_info_.end(); 190 it != pending_database_info_.end();
191 ++it) { 191 ++it) {
192 if (it->origin == origin && it->name == name) { 192 if (it->origin == origin && it->name == name) {
193 pending_database_info_.erase(it); 193 pending_database_info_.erase(it);
194 break; 194 break;
195 } 195 }
196 } 196 }
197 BrowsingDataDatabaseHelper::DeleteDatabase(origin_identifier, name); 197 BrowsingDataDatabaseHelper::DeleteDatabase(origin_identifier, name);
198 } 198 }
199 199
200 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {} 200 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698