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

Unified Diff: content/common/gpu/client/gl_helper_unittest.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 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 | « content/common/gpu/client/gl_helper_scaling.cc ('k') | content/common/gpu/client/gpu_channel_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « content/common/gpu/client/gl_helper_scaling.cc ('k') | content/common/gpu/client/gpu_channel_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698