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

Unified Diff: chrome/browser/safe_browsing/local_database_manager_unittest.cc

Issue 2442953002: Remove stl_util's deletion function use from chrome/. (Closed)
Patch Set: fix Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/local_database_manager_unittest.cc
diff --git a/chrome/browser/safe_browsing/local_database_manager_unittest.cc b/chrome/browser/safe_browsing/local_database_manager_unittest.cc
index 50ac18aa9cf2f0a1d8cb24cecdff4da0699eb745..35a29a36d38ae6762b1c877ee58280dfbba97828 100644
--- a/chrome/browser/safe_browsing/local_database_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/local_database_manager_unittest.cc
@@ -42,7 +42,8 @@ class LocalDatabaseManagerTest : public PlatformTest {
const std::vector<HostListPair>& host_list_results);
private:
- bool RunTest(LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck* check,
+ bool RunTest(std::unique_ptr<
+ LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check,
const std::vector<SBFullHashResult>& hash_results);
TestBrowserThreadBundle thread_bundle_;
@@ -64,7 +65,7 @@ bool LocalDatabaseManagerTest::RunSBHashTest(
GetListId(result_list)};
fake_results.push_back(full_hash_result);
}
- return RunTest(check.get(), fake_results);
+ return RunTest(std::move(check), fake_results);
}
bool LocalDatabaseManagerTest::RunUrlTest(
@@ -81,20 +82,21 @@ bool LocalDatabaseManagerTest::RunUrlTest(
{SBFullHashForString(host_list.host), GetListId(host_list.list_type)};
full_hash_results.push_back(hash_result);
}
- return RunTest(check.get(), full_hash_results);
+ return RunTest(std::move(check), full_hash_results);
}
bool LocalDatabaseManagerTest::RunTest(
- LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck* check,
+ std::unique_ptr<LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check,
const std::vector<SBFullHashResult>& hash_results) {
scoped_refptr<SafeBrowsingService> sb_service_(
SafeBrowsingService::CreateSafeBrowsingService());
scoped_refptr<LocalSafeBrowsingDatabaseManager> db_manager_(
new LocalSafeBrowsingDatabaseManager(sb_service_));
- db_manager_->checks_.insert(check);
+ LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck* check_ptr = check.get();
+ db_manager_->checks_[check_ptr] = std::move(check);
- bool result = db_manager_->HandleOneCheck(check, hash_results);
- db_manager_->checks_.erase(check);
+ bool result = db_manager_->HandleOneCheck(check_ptr, hash_results);
+ db_manager_->checks_.erase(check_ptr);
return result;
}
« no previous file with comments | « chrome/browser/safe_browsing/local_database_manager.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698