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

Unified Diff: cc/debug/unittest_only_benchmark.cc

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foramted. 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
Index: cc/debug/unittest_only_benchmark.cc
diff --git a/cc/debug/unittest_only_benchmark.cc b/cc/debug/unittest_only_benchmark.cc
index e8146ad3ce249355db793db2d9db571762a8ea84..aa81439cef50238cffbbf500966daf6545792b90 100644
--- a/cc/debug/unittest_only_benchmark.cc
+++ b/cc/debug/unittest_only_benchmark.cc
@@ -19,7 +19,7 @@ UnittestOnlyBenchmark::UnittestOnlyBenchmark(scoped_ptr<base::Value> value,
if (!value)
return;
- base::DictionaryValue* settings = NULL;
+ base::DictionaryValue* settings = nullptr;
value->GetAsDictionary(&settings);
if (!settings)
return;
@@ -37,7 +37,7 @@ void UnittestOnlyBenchmark::DidUpdateLayers(LayerTreeHost* host) {
}
bool UnittestOnlyBenchmark::ProcessMessage(scoped_ptr<base::Value> value) {
- base::DictionaryValue* message = NULL;
+ base::DictionaryValue* message = nullptr;
value->GetAsDictionary(&message);
bool can_handle;
if (message->HasKey("can_handle")) {
@@ -55,11 +55,11 @@ void UnittestOnlyBenchmark::RecordImplResults(scoped_ptr<base::Value> results) {
scoped_ptr<MicroBenchmarkImpl> UnittestOnlyBenchmark::CreateBenchmarkImpl(
scoped_refptr<base::MessageLoopProxy> origin_loop) {
if (!create_impl_benchmark_)
- return make_scoped_ptr<MicroBenchmarkImpl>(NULL);
+ return make_scoped_ptr<MicroBenchmarkImpl>(nullptr);
return make_scoped_ptr(new UnittestOnlyBenchmarkImpl(
origin_loop,
- NULL,
+ nullptr,
base::Bind(&UnittestOnlyBenchmark::RecordImplResults,
weak_ptr_factory_.GetWeakPtr())));
}

Powered by Google App Engine
This is Rietveld 408576698