| Index: extensions/common/api/bluetooth/bluetooth_manifest_handler.cc
|
| diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc b/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc
|
| index da143fa8c2fb52262f17a4a848b4a9ec88a9bdd3..235beb06c5825fe8d96792dc31bdb4bf3bb593fd 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_handler.cc
|
| @@ -17,7 +17,7 @@ BluetoothManifestHandler::~BluetoothManifestHandler() {}
|
|
|
| bool BluetoothManifestHandler::Parse(Extension* extension,
|
| base::string16* error) {
|
| - const base::Value* bluetooth = NULL;
|
| + const base::Value* bluetooth = nullptr;
|
| CHECK(extension->manifest()->Get(manifest_keys::kBluetooth, &bluetooth));
|
| scoped_ptr<BluetoothManifestData> data =
|
| BluetoothManifestData::FromValue(*bluetooth, error);
|
| @@ -37,7 +37,7 @@ ManifestPermission* BluetoothManifestHandler::CreateInitialRequiredPermission(
|
| BluetoothManifestData* data = BluetoothManifestData::Get(extension);
|
| if (data)
|
| return data->permission()->Clone();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| const std::vector<std::string> BluetoothManifestHandler::Keys() const {
|
|
|