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

Unified Diff: chrome/browser/safe_browsing/local_database_manager_unittest.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_browsing/local_database_manager.cc ('k') | chrome/browser/safe_browsing/ping_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2ce3c3c27d7f75b94d6f0df3a31c849883d23ccf..50ac18aa9cf2f0a1d8cb24cecdff4da0699eb745 100644
--- a/chrome/browser/safe_browsing/local_database_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/local_database_manager_unittest.cc
@@ -2,16 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/safe_browsing/local_database_manager.h"
+
#include <stddef.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
-#include "chrome/browser/safe_browsing/local_database_manager.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -52,7 +53,7 @@ bool LocalDatabaseManagerTest::RunSBHashTest(
const std::vector<SBThreatType>& expected_threats,
const std::vector<std::string>& result_lists) {
const SBFullHash same_full_hash = {};
- scoped_ptr<LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check(
+ std::unique_ptr<LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check(
new LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck(
std::vector<GURL>(), std::vector<SBFullHash>(1, same_full_hash), NULL,
list_type, expected_threats));
@@ -70,10 +71,10 @@ bool LocalDatabaseManagerTest::RunUrlTest(
const GURL& url, ListType list_type,
const std::vector<SBThreatType>& expected_threats,
const std::vector<HostListPair>& host_list_results) {
- scoped_ptr<LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check(
+ std::unique_ptr<LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck> check(
new LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck(
- std::vector<GURL>(1, url), std::vector<SBFullHash>(), NULL,
- list_type, expected_threats));
+ std::vector<GURL>(1, url), std::vector<SBFullHash>(), NULL, list_type,
+ expected_threats));
std::vector<SBFullHashResult> full_hash_results;
for (const auto& host_list : host_list_results) {
SBFullHashResult hash_result =
« no previous file with comments | « chrome/browser/safe_browsing/local_database_manager.cc ('k') | chrome/browser/safe_browsing/ping_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698