Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / debug / unittest_only_benchmark.cc

diff --git a/src/cc/debug/unittest_only_benchmark.cc b/src/cc/debug/unittest_only_benchmark.cc
index 0f0694a..2bd5be9 100644 (file)
--- a/src/cc/debug/unittest_only_benchmark.cc
+++ b/src/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;
@@ -33,11 +33,11 @@ UnittestOnlyBenchmark::~UnittestOnlyBenchmark() {
 }
 
 void UnittestOnlyBenchmark::DidUpdateLayers(LayerTreeHost* host) {
-  NotifyDone(scoped_ptr<base::Value>());
+  NotifyDone(nullptr);
 }
 
 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 scoped_ptr<MicroBenchmarkImpl>(new UnittestOnlyBenchmarkImpl(
+  return make_scoped_ptr(new UnittestOnlyBenchmarkImpl(
       origin_loop,
-      NULL,
+      nullptr,
       base::Bind(&UnittestOnlyBenchmark::RecordImplResults,
                  weak_ptr_factory_.GetWeakPtr())));
 }