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

Unified Diff: chrome/browser/safe_browsing/incident_reporting/resource_request_detector_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
Index: chrome/browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc
index edd3f95d7d1fcbb81e3e1e7f18b93c3e68078cf1..dc30b51278cda30c50fbbe5f928dcb9ebed43a40 100644
--- a/chrome/browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/safe_browsing/incident_reporting/incident.h"
#include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h"
@@ -39,7 +40,7 @@ class FakeResourceRequestDetector : public ResourceRequestDetector {
public:
FakeResourceRequestDetector(
scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
- scoped_ptr<IncidentReceiver> incident_receiver)
+ std::unique_ptr<IncidentReceiver> incident_receiver)
: ResourceRequestDetector(database_manager,
std::move(incident_receiver)) {
FakeResourceRequestDetector::set_allow_null_profile_for_testing(true);
@@ -76,16 +77,15 @@ class ResourceRequestDetectorTest : public testing::Test {
ResourceRequestDetectorTest()
: mock_incident_receiver_(
new StrictMock<safe_browsing::MockIncidentReceiver>()),
- mock_database_manager_(
- new StrictMock<MockSafeBrowsingDatabaseManager>),
+ mock_database_manager_(new StrictMock<MockSafeBrowsingDatabaseManager>),
fake_resource_request_detector_(
mock_database_manager_,
- make_scoped_ptr(mock_incident_receiver_)) {}
+ base::WrapUnique(mock_incident_receiver_)) {}
- scoped_ptr<net::URLRequest> GetTestURLRequest(
+ std::unique_ptr<net::URLRequest> GetTestURLRequest(
const std::string& url,
content::ResourceType resource_type) const {
- scoped_ptr<net::URLRequest> url_request(
+ std::unique_ptr<net::URLRequest> url_request(
context_.CreateRequest(GURL(url), net::DEFAULT_PRIORITY, NULL));
content::ResourceRequestInfo::AllocateForTesting(
@@ -126,7 +126,8 @@ class ResourceRequestDetectorTest : public testing::Test {
void ExpectNoIncident(const std::string& url,
content::ResourceType resource_type) {
- scoped_ptr<net::URLRequest> request(GetTestURLRequest(url, resource_type));
+ std::unique_ptr<net::URLRequest> request(
+ GetTestURLRequest(url, resource_type));
EXPECT_CALL(*mock_incident_receiver_, DoAddIncidentForProfile(IsNull(), _))
.Times(0);
@@ -140,8 +141,9 @@ class ResourceRequestDetectorTest : public testing::Test {
content::ResourceType resource_type,
ResourceRequestIncidentMessage::Type expected_type,
const std::string& expected_digest) {
- scoped_ptr<net::URLRequest> request(GetTestURLRequest(url, resource_type));
- scoped_ptr<Incident> incident;
+ std::unique_ptr<net::URLRequest> request(
+ GetTestURLRequest(url, resource_type));
+ std::unique_ptr<Incident> incident;
EXPECT_CALL(*mock_incident_receiver_, DoAddIncidentForProfile(IsNull(), _))
.WillOnce(WithArg<1>(TakeIncident(&incident)));
@@ -149,7 +151,7 @@ class ResourceRequestDetectorTest : public testing::Test {
base::RunLoop().RunUntilIdle();
ASSERT_TRUE(incident);
- scoped_ptr<ClientIncidentReport_IncidentData> incident_data =
+ std::unique_ptr<ClientIncidentReport_IncidentData> incident_data =
incident->TakePayload();
ASSERT_TRUE(incident_data && incident_data->has_resource_request());
const ResourceRequestIncidentMessage& script_request_incident =

Powered by Google App Engine
This is Rietveld 408576698