| Index: extensions/browser/api/bluetooth/bluetooth_event_router.cc
|
| diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
|
| index 1064d0bdad177dc91b4e3dac3d5cd8f34e6a9b1b..fc90e88783cd5e8b363d25a41e105f1c5d0b214f 100644
|
| --- a/extensions/browser/api/bluetooth/bluetooth_event_router.cc
|
| +++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
|
| @@ -38,7 +38,7 @@ namespace bt_private = core_api::bluetooth_private;
|
|
|
| BluetoothEventRouter::BluetoothEventRouter(content::BrowserContext* context)
|
| : browser_context_(context),
|
| - adapter_(NULL),
|
| + adapter_(nullptr),
|
| num_event_listeners_(0),
|
| extension_registry_observer_(this),
|
| weak_ptr_factory_(this) {
|
| @@ -54,7 +54,7 @@ BluetoothEventRouter::~BluetoothEventRouter() {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| if (adapter_.get()) {
|
| adapter_->RemoveObserver(this);
|
| - adapter_ = NULL;
|
| + adapter_ = nullptr;
|
| }
|
| CleanUpAllExtensions();
|
| }
|
| @@ -122,7 +122,7 @@ BluetoothApiPairingDelegate* BluetoothEventRouter::GetPairingDelegate(
|
| const std::string& extension_id) {
|
| return ContainsKey(pairing_delegate_map_, extension_id)
|
| ? pairing_delegate_map_[extension_id]
|
| - : NULL;
|
| + : nullptr;
|
| }
|
|
|
| void BluetoothEventRouter::OnAdapterInitialized(
|
| @@ -140,7 +140,7 @@ void BluetoothEventRouter::MaybeReleaseAdapter() {
|
| if (adapter_.get() && num_event_listeners_ == 0 &&
|
| pairing_delegate_map_.empty()) {
|
| adapter_->RemoveObserver(this);
|
| - adapter_ = NULL;
|
| + adapter_ = nullptr;
|
| }
|
| }
|
|
|
|
|