NULL -> nullptr under athena/

athena/content/content_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/content/content_proxy.h"
 
 #include "base/bind.h"
 #include "base/threading/worker_pool.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 83 matching lines @@
   png_data_->Release();
 }
 
 void ContentProxy::OnPreContentDestroyed() {
   // Since we are breaking now the connection to the old content, we make the
   // content visible again before we continue.
   // Note: Since the owning window is invisible, it does not matter that we
   // make the web content visible if the window gets destroyed shortly after.
   ShowOriginalContent();
 
-  web_view_ = NULL;
+  web_view_ = nullptr;
 }
 
 void ContentProxy::ShowOriginalContent() {
   if (web_view_ && !content_visible_) {
     // Show the original |web_view_| again.
     web_view_->SetFastResize(false);
     // If the content is loaded, we ask it to relayout itself since the
     // dimensions might have changed. If not, we will reload new content and no
     // layout is required for the old content.
     if (content_loaded_)
@@ skipping 66 matching lines @@
 
 void ContentProxy::OnContentImageEncodeComplete(
     scoped_refptr<ProxyImageData> image) {
   png_data_ = image->data();
 
   // From now on we decode the image as needed to save memory.
   raw_image_ = gfx::ImageSkia();
 }
 
 }  // namespace athena