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

content/browser/accessibility/accessibility_mode_browsertest.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 "content/browser/accessibility/accessibility_mode_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 15 matching lines @@
 class AccessibilityModeTest : public ContentBrowserTest {
  protected:
   WebContentsImpl* web_contents() {
     return static_cast<WebContentsImpl*>(shell()->web_contents());
   }
 
   void ExpectBrowserAccessibilityManager(bool expect_bam,
                                          std::string message = "") {
     if (expect_bam) {
       EXPECT_NE(
-          (BrowserAccessibilityManager*)NULL,
+          (BrowserAccessibilityManager*)nullptr,

[dmazzoni, 2014/10/10 16:49:49]

Is the typecast still necessary when we use nullptr? I expect it isn't. Please
try removing the typecast whenever NULL was used inside an EXPECT or ASSERT
assertion in a test.

           web_contents()->GetRootBrowserAccessibilityManager()) << message;
     } else {
       EXPECT_EQ(
-          (BrowserAccessibilityManager*)NULL,
+          (BrowserAccessibilityManager*)nullptr,
           web_contents()->GetRootBrowserAccessibilityManager()) << message;
     }
   }
 
   AccessibilityMode CorrectedAccessibility(AccessibilityMode mode) {
     return AddAccessibilityModeTo(GetBaseAccessibilityMode(), mode);
   }
 
   bool ShouldBeBrowserAccessibilityManager(AccessibilityMode mode) {
     mode = CorrectedAccessibility(mode);
@@ skipping 65 matching lines @@
   web_contents()->AddAccessibilityMode(AccessibilityModeComplete);
   EXPECT_EQ(AccessibilityModeComplete, web_contents()->GetAccessibilityMode());
   waiter2.WaitForNotification();
   ExpectBrowserAccessibilityManager(ShouldBeBrowserAccessibilityManager(
                                           AccessibilityModeComplete),
                                     "Should be a BrowserAccessibilityManager "
                                     "for AccessibilityModeComplete");
 }
 
 }  // namespace content