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

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

Issue 2358723002: Convert FieldTrialList to Accept a std::unique_ptr (Closed)
Patch Set: Change Comment nullptr to null Created 4 years, 3 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/client_side_model_loader_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc b/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
index f26f46f8ae208e3e1abacf12f56992ac29259d3a..8afe6e8b4e35327c0badb9ca140fb1f0914287ea 100644
--- a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
@@ -54,8 +54,8 @@ class MockModelLoader : public ModelLoader {
class ModelLoaderTest : public testing::Test {
protected:
ModelLoaderTest()
- : factory_(new net::FakeURLFetcherFactory(NULL)),
- field_trials_(new base::FieldTrialList(NULL)) {}
+ : factory_(new net::FakeURLFetcherFactory(nullptr)),
+ field_trials_(new base::FieldTrialList(nullptr)) {}
void SetUp() override {
variations::testing::ClearAllVariationIDs();
@@ -68,7 +68,7 @@ class ModelLoaderTest : public testing::Test {
// Destroy the existing FieldTrialList before creating a new one to avoid
// a DCHECK.
field_trials_.reset();
- field_trials_.reset(new base::FieldTrialList(NULL));
+ field_trials_.reset(new base::FieldTrialList(nullptr));
variations::testing::ClearAllVariationIDs();
variations::testing::ClearAllVariationParams();

Powered by Google App Engine
This is Rietveld 408576698