Run clang-modernize -use-nullptr over src/extensions/.

extensions/browser/api/bluetooth/bluetooth_apitest.cc

 // Copyright (c) 2012 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 <string.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
@@ skipping 114 matching lines @@
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(false));
 
   scoped_refptr<api::BluetoothGetAdapterStateFunction> get_adapter_state;
   get_adapter_state = setupFunction(new api::BluetoothGetAdapterStateFunction);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
       get_adapter_state.get(), "[]", browser()));
-  ASSERT_TRUE(result.get() != NULL);
+  ASSERT_TRUE(result.get() != nullptr);
   api::bluetooth::AdapterState state;
   ASSERT_TRUE(api::bluetooth::AdapterState::Populate(*result, &state));
 
   EXPECT_FALSE(state.available);
   EXPECT_TRUE(state.powered);
   EXPECT_FALSE(state.discovering);
   EXPECT_EQ(kName, state.name);
   EXPECT_EQ(kAdapterAddress, state.address);
 }
 
@@ skipping 236 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevice) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(device1_->GetAddress()))
       .WillOnce(testing::Return(device1_.get()));
   EXPECT_CALL(*mock_adapter_, GetDevice(device2_->GetAddress()))
       .Times(1)
-      .WillRepeatedly(testing::Return(static_cast<BluetoothDevice*>(NULL)));
+      .WillRepeatedly(testing::Return(static_cast<BluetoothDevice*>(nullptr)));

[Nico, 2014/09/25 05:57:19]

Hmm, is this static_cast still needed with nullptr?

[Sam McNally, 2014/09/25 07:42:38]

Clang on Linux and MSVC are both happy without the static_cast.

[Nico, 2014/09/25 19:33:41]

Hm, maybe we can contribute a patch to clang-modernize to strip out unnecessary
casts of NULL when converting to nullptr?

 
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/get_device")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ skipping 50 matching lines @@
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/device_info")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }