Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: extensions/browser/api/bluetooth/bluetooth_apitest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/bluetooth/bluetooth_apitest.cc
diff --git a/extensions/browser/api/bluetooth/bluetooth_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
index a808027f3270dece78545009ed5d51eda359a988..ae613c5d78ce7a0a8df7c76a40c1b6f1455ad622 100644
--- a/extensions/browser/api/bluetooth/bluetooth_apitest.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
@@ -132,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetAdapterState) {
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));
@@ -389,7 +389,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevice) {
.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
Nico 2014/09/25 19:33:41 Hm, maybe we can contribute a patch to clang-moder
// Load and wait for setup
ExtensionTestMessageListener listener("ready", true);
« no previous file with comments | « extensions/browser/api/bluetooth/bluetooth_api.cc ('k') | extensions/browser/api/bluetooth/bluetooth_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698