Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / activity / activity_factory.cc

diff --git a/src/athena/activity/activity_factory.cc b/src/athena/activity/activity_factory.cc
index 2507281..dbaa77d 100644 (file)
--- a/src/athena/activity/activity_factory.cc
+++ b/src/athena/activity/activity_factory.cc
@@ -10,8 +10,7 @@ namespace athena {
 
 namespace {
 
-ActivityFactory* instance = NULL;
-
+ActivityFactory* instance = nullptr;
 }
 
 // static
@@ -30,7 +29,7 @@ ActivityFactory* ActivityFactory::Get() {
 void ActivityFactory::Shutdown() {
   DCHECK(instance);
   delete instance;
-  instance = NULL;
+  instance = nullptr;
 }
 
 }  // namespace athena