C++11 declares a type safe null pointer

content/common/gpu/media/vaapi_wrapper.cc

Index: content/common/gpu/media/vaapi_wrapper.cc
diff --git a/content/common/gpu/media/vaapi_wrapper.cc b/content/common/gpu/media/vaapi_wrapper.cc
index 2b4b33349aa12a3d77ed7680c06f18ad6e1bd775..c282a183d90e4930f2cdb86734155281d0ded949 100644
--- a/content/common/gpu/media/vaapi_wrapper.cc
+++ b/content/common/gpu/media/vaapi_wrapper.cc
@@ -133,7 +133,7 @@ VASurface::~VASurface() {
 }
 
 VaapiWrapper::VaapiWrapper()
-    : va_display_(NULL),
+    : va_display_(nullptr),
       va_config_id_(VA_INVALID_ID),
       va_context_id_(VA_INVALID_ID) {
 }
@@ -356,7 +356,7 @@ void VaapiWrapper::Deinitialize() {
   }
 
   va_config_id_ = VA_INVALID_ID;
-  va_display_ = NULL;
+  va_display_ = nullptr;
 }
 
 bool VaapiWrapper::VAAPIVersionLessThan(int major, int minor) {
@@ -380,7 +380,7 @@ bool VaapiWrapper::CreateSurfaces(gfx::Size size,
                                      size.width(), size.height(),
                                      &va_surface_ids_[0],
                                      va_surface_ids_.size(),
-                                     NULL, 0);
+                                     nullptr, 0);
 
   VA_LOG_ON_ERROR(va_res, "vaCreateSurfaces failed");
   if (va_res != VA_STATUS_SUCCESS) {
@@ -461,11 +461,11 @@ bool VaapiWrapper::SubmitVAEncMiscParamBuffer(
                                    VAEncMiscParameterBufferType,
                                    sizeof(VAEncMiscParameterBuffer) + size,
                                    1,
-                                   NULL,
+                                   nullptr,
                                    &buffer_id);
   VA_SUCCESS_OR_RETURN(va_res, "Failed to create a VA buffer", false);
 
-  void* data_ptr = NULL;
+  void* data_ptr = nullptr;
   va_res = vaMapBuffer(va_display_, buffer_id, &data_ptr);
   VA_LOG_ON_ERROR(va_res, "vaMapBuffer failed");
   if (va_res != VA_STATUS_SUCCESS) {
@@ -510,7 +510,7 @@ bool VaapiWrapper::CreateCodedBuffer(size_t size, VABufferID* buffer_id) {
                                    VAEncCodedBufferType,
                                    size,
                                    1,
-                                   NULL,
+                                   nullptr,
                                    buffer_id);
   VA_SUCCESS_OR_RETURN(va_res, "Failed to create a coded buffer", false);
 
@@ -588,7 +588,7 @@ bool VaapiWrapper::PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
                         x_pixmap,
                         0, 0, dest_size.width(), dest_size.height(),
                         0, 0, dest_size.width(), dest_size.height(),
-                        NULL, 0, 0);
+                        nullptr, 0, 0);
   VA_SUCCESS_OR_RETURN(va_res, "Failed putting surface to pixmap", false);
   return true;
 }
@@ -655,7 +655,7 @@ bool VaapiWrapper::UploadVideoFrameToSurface(
     return false;
   }
 
-  void* image_ptr = NULL;
+  void* image_ptr = nullptr;
   va_res = vaMapBuffer(va_display_, image.buf, &image_ptr);
   VA_SUCCESS_OR_RETURN(va_res, "vaMapBuffer failed", false);
   DCHECK(image_ptr);
@@ -693,7 +693,7 @@ bool VaapiWrapper::DownloadAndDestroyCodedBuffer(VABufferID buffer_id,
   VAStatus va_res = vaSyncSurface(va_display_, sync_surface_id);
   VA_SUCCESS_OR_RETURN(va_res, "Failed syncing surface", false);
 
-  VACodedBufferSegment* buffer_segment = NULL;
+  VACodedBufferSegment* buffer_segment = nullptr;
   va_res = vaMapBuffer(
       va_display_, buffer_id, reinterpret_cast<void**>(&buffer_segment));
   VA_SUCCESS_OR_RETURN(va_res, "vaMapBuffer failed", false);
@@ -730,7 +730,7 @@ bool VaapiWrapper::DownloadAndDestroyCodedBuffer(VABufferID buffer_id,
 
   DCHECK(coded_buffers_.erase(buffer_id));
 
-  return buffer_segment == NULL;
+  return buffer_segment == nullptr;
 }
 
 // static