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

Unified Diff: chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_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/binary_integrity_incident_unittest.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc
index e4d7cdaae64589737223add3e610c4f93e4bcf05..bf493c62141d2d5a9499aecc7247c3698832e513 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc
@@ -5,10 +5,12 @@
#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h"
#include <stddef.h>
+
+#include <memory>
#include <utility>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "chrome/common/safe_browsing/csd.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -16,8 +18,8 @@ namespace safe_browsing {
namespace {
-scoped_ptr<Incident> MakeIncident(const char* file_basename) {
- scoped_ptr<ClientIncidentReport_IncidentData_BinaryIntegrityIncident>
+std::unique_ptr<Incident> MakeIncident(const char* file_basename) {
+ std::unique_ptr<ClientIncidentReport_IncidentData_BinaryIntegrityIncident>
incident(new ClientIncidentReport_IncidentData_BinaryIntegrityIncident);
incident->set_file_basename(file_basename);
@@ -38,7 +40,7 @@ scoped_ptr<Incident> MakeIncident(const char* file_basename) {
element->set_certificate(certificates[i], arraysize(certificates[i]));
}
- return make_scoped_ptr(new BinaryIntegrityIncident(std::move(incident)));
+ return base::WrapUnique(new BinaryIntegrityIncident(std::move(incident)));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698