[C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4]

cc/scheduler/begin_frame_source.cc

Index: cc/scheduler/begin_frame_source.cc
diff --git a/cc/scheduler/begin_frame_source.cc b/cc/scheduler/begin_frame_source.cc
index 4a9f18440834d20f340a9f3fa4d86977681d36f9..0d9c582b31e214833069407c7650a0bb8bf2842d 100644
--- a/cc/scheduler/begin_frame_source.cc
+++ b/cc/scheduler/begin_frame_source.cc
@@ -61,7 +61,7 @@ void BeginFrameObserverMixIn::AsValueInto(
 
 // BeginFrameSourceMixIn ------------------------------------------------------
 BeginFrameSourceMixIn::BeginFrameSourceMixIn()
-    : observer_(NULL),
+    : observer_(nullptr),
       needs_begin_frames_(false),
       inside_as_value_into_(false) {
   DCHECK(!observer_);
@@ -101,7 +101,7 @@ void BeginFrameSourceMixIn::RemoveObserver(BeginFrameObserver* obs) {
                "to remove observer",
                obs);
   DCHECK_EQ(observer_, obs);
-  observer_ = NULL;
+  observer_ = nullptr;
 }
 
 void BeginFrameSourceMixIn::CallOnBeginFrame(const BeginFrameArgs& args) {
@@ -131,7 +131,7 @@ void BeginFrameSourceMixIn::AsValueInto(base::debug::TracedValue* dict) const {
     observer_->AsValueInto(dict);
     dict->EndDictionary();
   } else {
-    dict->SetString("observer", "NULL");
+    dict->SetString("observer", "nullptr");

[viettrungluu, 2014/10/10 17:16:20]

WAT

[danakj, 2014/10/10 17:18:52]

This will change the output of tracing to show nullptr instead of NULL. Idk that
either is better than the other in this case.

You're right that nullptr in a comment is usually better written as null though,
I need to go back and look for that.

   }
   dict->SetBoolean("needs_begin_frames", NeedsBeginFrames());
 }
@@ -287,7 +287,7 @@ scoped_ptr<BeginFrameSourceMultiplexer> BeginFrameSourceMultiplexer::Create() {
 BeginFrameSourceMultiplexer::BeginFrameSourceMultiplexer()
     : BeginFrameSourceMixIn(),
       minimum_interval_(base::TimeDelta()),
-      active_source_(NULL),
+      active_source_(nullptr),
       source_list_() {
 }
 
@@ -295,7 +295,7 @@ BeginFrameSourceMultiplexer::BeginFrameSourceMultiplexer(
     base::TimeDelta minimum_interval)
     : BeginFrameSourceMixIn(),
       minimum_interval_(minimum_interval),
-      active_source_(NULL),
+      active_source_(nullptr),
       source_list_() {
 }
 
@@ -350,7 +350,7 @@ void BeginFrameSourceMultiplexer::SetActiveSource(
                "to become active",
                new_source);
 
-  DCHECK(HasSource(new_source) || new_source == NULL);
+  DCHECK(HasSource(new_source) || new_source == nullptr);
 
   bool needs_begin_frames = NeedsBeginFrames();
   if (active_source_) {
@@ -361,7 +361,7 @@ void BeginFrameSourceMultiplexer::SetActiveSource(
     // the case where SetNeedsBeginFrames message gets to the source after a
     // message has already been sent.
     active_source_->RemoveObserver(this);
-    active_source_ = NULL;
+    active_source_ = nullptr;
   }
   DCHECK(!active_source_);
   active_source_ = new_source;
@@ -455,7 +455,7 @@ void BeginFrameSourceMultiplexer::AsValueInto(
     active_source_->AsValueInto(dict);
     dict->EndDictionary();
   } else {
-    dict->SetString("active_source", "NULL");
+    dict->SetString("active_source", "nullptr");

[viettrungluu, 2014/10/10 17:16:20]

"

   }
 
   dict->BeginArray("sources");