Index: content/common/gpu/client/gl_helper_unittest.cc |
diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc |
index b86716614ed25c6d68d67d3084ee39b07a7469f7..ea5179d72b42d4bd58cd95602d09d943fb3904e2 100644 |
--- a/content/common/gpu/client/gl_helper_unittest.cc |
+++ b/content/common/gpu/client/gl_helper_unittest.cc |
@@ -68,9 +68,9 @@ class GLHelperTest : public testing::Test { |
} |
virtual void TearDown() { |
- helper_scaling_.reset(NULL); |
- helper_.reset(NULL); |
- context_.reset(NULL); |
+ helper_scaling_.reset(nullptr); |
+ helper_.reset(nullptr); |
+ context_.reset(nullptr); |
} |
void StartTracing(const std::string& filter) { |
@@ -112,7 +112,7 @@ class GLHelperTest : public testing::Test { |
base::ListValue* list; |
CHECK(trace_data->GetAsList(&list)); |
for (size_t i = 0; i < list->GetSize(); i++) { |
- base::Value* item = NULL; |
+ base::Value* item = nullptr; |
if (list->Get(i, &item)) { |
base::DictionaryValue* dict; |
CHECK(item->GetAsDictionary(&dict)); |
@@ -772,7 +772,7 @@ class GLHelperTest : public testing::Test { |
Compare(input_pixels.get(), |
&output_pixels, |
0, |
- NULL, |
+ nullptr, |
dummy_stages, |
message + " comparing against input"); |
return; |
@@ -879,7 +879,7 @@ class GLHelperTest : public testing::Test { |
Compare(input_pixels.get(), |
&output_pixels, |
0, |
- NULL, |
+ nullptr, |
stages, |
message + " comparing against input"); |
return; |