| Index: extensions/browser/api/bluetooth/bluetooth_private_api.cc
 | 
| diff --git a/extensions/browser/api/bluetooth/bluetooth_private_api.cc b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
 | 
| index 8729f73b108488a895bd50d54e6f093b6118634e..684ca8784e06581fc64b77eb8a3d419718c32566 100644
 | 
| --- a/extensions/browser/api/bluetooth/bluetooth_private_api.cc
 | 
| +++ b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
 | 
| @@ -86,8 +86,8 @@ bool ValidatePairingResponseOptions(
 | 
|      const device::BluetoothDevice* device,
 | 
|      const bt_private::SetPairingResponseOptions& options) {
 | 
|    bool response = options.response != bt_private::PAIRING_RESPONSE_NONE;
 | 
| -  bool pincode = options.pincode.get() != NULL;
 | 
| -  bool passkey = options.passkey.get() != NULL;
 | 
| +  bool pincode = options.pincode.get() != nullptr;
 | 
| +  bool passkey = options.passkey.get() != nullptr;
 | 
|  
 | 
|    if (!response && !pincode && !passkey)
 | 
|      return false;
 | 
| @@ -220,8 +220,8 @@ void BluetoothPrivateSetAdapterStateFunction::SendError() {
 | 
|  
 | 
|    std::vector<std::string> replacements(1);
 | 
|    replacements[0] = JoinString(failed_vector, ", ");
 | 
| -  std::string error =
 | 
| -      ReplaceStringPlaceholders(kSetAdapterPropertyError, replacements, NULL);
 | 
| +  std::string error = ReplaceStringPlaceholders(
 | 
| +      kSetAdapterPropertyError, replacements, nullptr);
 | 
|    SetError(error);
 | 
|    SendResponse(false);
 | 
|  }
 | 
| 
 |