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

Side by Side Diff: chrome/browser/safe_browsing/local_database_manager.cc

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address comments 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 (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/safe_browsing/local_database_manager.h" 5 #include "chrome/browser/safe_browsing/local_database_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 DCHECK(enabled_); 621 DCHECK(enabled_);
622 DCHECK(!callback.is_null()); 622 DCHECK(!callback.is_null());
623 safe_browsing_task_runner_->PostTask( 623 safe_browsing_task_runner_->PostTask(
624 FROM_HERE, 624 FROM_HERE,
625 base::Bind(&LocalSafeBrowsingDatabaseManager::GetAllChunksFromDatabase, 625 base::Bind(&LocalSafeBrowsingDatabaseManager::GetAllChunksFromDatabase,
626 this, callback)); 626 this, callback));
627 } 627 }
628 628
629 void LocalSafeBrowsingDatabaseManager::AddChunks( 629 void LocalSafeBrowsingDatabaseManager::AddChunks(
630 const std::string& list, 630 const std::string& list,
631 scoped_ptr<std::vector<scoped_ptr<SBChunkData>>> chunks, 631 std::unique_ptr<std::vector<std::unique_ptr<SBChunkData>>> chunks,
632 AddChunksCallback callback) { 632 AddChunksCallback callback) {
633 DCHECK_CURRENTLY_ON(BrowserThread::IO); 633 DCHECK_CURRENTLY_ON(BrowserThread::IO);
634 DCHECK(enabled_); 634 DCHECK(enabled_);
635 DCHECK(!callback.is_null()); 635 DCHECK(!callback.is_null());
636 safe_browsing_task_runner_->PostTask( 636 safe_browsing_task_runner_->PostTask(
637 FROM_HERE, 637 FROM_HERE,
638 base::Bind(&LocalSafeBrowsingDatabaseManager::AddDatabaseChunks, this, 638 base::Bind(&LocalSafeBrowsingDatabaseManager::AddDatabaseChunks, this,
639 list, base::Passed(&chunks), callback)); 639 list, base::Passed(&chunks), callback));
640 } 640 }
641 641
642 void LocalSafeBrowsingDatabaseManager::DeleteChunks( 642 void LocalSafeBrowsingDatabaseManager::DeleteChunks(
643 scoped_ptr<std::vector<SBChunkDelete>> chunk_deletes) { 643 std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) {
644 DCHECK_CURRENTLY_ON(BrowserThread::IO); 644 DCHECK_CURRENTLY_ON(BrowserThread::IO);
645 DCHECK(enabled_); 645 DCHECK(enabled_);
646 safe_browsing_task_runner_->PostTask( 646 safe_browsing_task_runner_->PostTask(
647 FROM_HERE, 647 FROM_HERE,
648 base::Bind(&LocalSafeBrowsingDatabaseManager::DeleteDatabaseChunks, this, 648 base::Bind(&LocalSafeBrowsingDatabaseManager::DeleteDatabaseChunks, this,
649 base::Passed(&chunk_deletes))); 649 base::Passed(&chunk_deletes)));
650 } 650 }
651 651
652 void LocalSafeBrowsingDatabaseManager::UpdateStarted() { 652 void LocalSafeBrowsingDatabaseManager::UpdateStarted() {
653 DCHECK_CURRENTLY_ON(BrowserThread::IO); 653 DCHECK_CURRENTLY_ON(BrowserThread::IO);
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 std::vector<SBFullHash>(), check.client, 1005 std::vector<SBFullHash>(), check.client,
1006 check.check_type, check.expected_threats); 1006 check.check_type, check.expected_threats);
1007 sb_check.OnSafeBrowsingResult(); 1007 sb_check.OnSafeBrowsingResult();
1008 } 1008 }
1009 queued_checks_.pop_front(); 1009 queued_checks_.pop_front();
1010 } 1010 }
1011 } 1011 }
1012 1012
1013 void LocalSafeBrowsingDatabaseManager::AddDatabaseChunks( 1013 void LocalSafeBrowsingDatabaseManager::AddDatabaseChunks(
1014 const std::string& list_name, 1014 const std::string& list_name,
1015 scoped_ptr<std::vector<scoped_ptr<SBChunkData>>> chunks, 1015 std::unique_ptr<std::vector<std::unique_ptr<SBChunkData>>> chunks,
1016 AddChunksCallback callback) { 1016 AddChunksCallback callback) {
1017 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread()); 1017 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread());
1018 if (chunks) 1018 if (chunks)
1019 GetDatabase()->InsertChunks(list_name, *chunks); 1019 GetDatabase()->InsertChunks(list_name, *chunks);
1020 BrowserThread::PostTask( 1020 BrowserThread::PostTask(
1021 BrowserThread::IO, FROM_HERE, 1021 BrowserThread::IO, FROM_HERE,
1022 base::Bind(&LocalSafeBrowsingDatabaseManager::OnAddChunksComplete, this, 1022 base::Bind(&LocalSafeBrowsingDatabaseManager::OnAddChunksComplete, this,
1023 callback)); 1023 callback));
1024 } 1024 }
1025 1025
1026 void LocalSafeBrowsingDatabaseManager::DeleteDatabaseChunks( 1026 void LocalSafeBrowsingDatabaseManager::DeleteDatabaseChunks(
1027 scoped_ptr<std::vector<SBChunkDelete>> chunk_deletes) { 1027 std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) {
1028 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread()); 1028 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread());
1029 if (chunk_deletes) 1029 if (chunk_deletes)
1030 GetDatabase()->DeleteChunks(*chunk_deletes); 1030 GetDatabase()->DeleteChunks(*chunk_deletes);
1031 } 1031 }
1032 1032
1033 void LocalSafeBrowsingDatabaseManager::DatabaseUpdateFinished( 1033 void LocalSafeBrowsingDatabaseManager::DatabaseUpdateFinished(
1034 bool update_succeeded) { 1034 bool update_succeeded) {
1035 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread()); 1035 DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread());
1036 GetDatabase()->UpdateFinished(update_succeeded); 1036 GetDatabase()->UpdateFinished(update_succeeded);
1037 DCHECK(database_update_in_progress_); 1037 DCHECK(database_update_in_progress_);
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 FROM_HERE, base::Bind(&LocalSafeBrowsingDatabaseManager::TimeoutCallback, 1252 FROM_HERE, base::Bind(&LocalSafeBrowsingDatabaseManager::TimeoutCallback,
1253 check->weak_ptr_factory_->GetWeakPtr(), check), 1253 check->weak_ptr_factory_->GetWeakPtr(), check),
1254 check_timeout_); 1254 check_timeout_);
1255 } 1255 }
1256 1256
1257 bool LocalSafeBrowsingDatabaseManager::IsDownloadProtectionEnabled() const { 1257 bool LocalSafeBrowsingDatabaseManager::IsDownloadProtectionEnabled() const {
1258 return enable_download_protection_; 1258 return enable_download_protection_;
1259 } 1259 }
1260 1260
1261 } // namespace safe_browsing 1261 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/local_database_manager.h ('k') | chrome/browser/safe_browsing/local_database_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698