| Index: extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
 | 
| diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
 | 
| index 77d19d1a66658057b6a00403e723f56351e20680..32cb30b37e538a6b58d1907b81a92801a8e7737c 100644
 | 
| --- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
 | 
| +++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
 | 
| @@ -140,7 +140,7 @@ bool BluetoothSocketAsyncApiFunction::PrePrepare() {
 | 
|           "If this assertion is failing during a test, then it is likely that "
 | 
|           "TestExtensionSystem is failing to provide an instance of "
 | 
|           "ApiResourceManager<BluetoothApiSocket>.";
 | 
| -  return manager_ != NULL;
 | 
| +  return manager_ != nullptr;
 | 
|  }
 | 
|  
 | 
|  bool BluetoothSocketAsyncApiFunction::Respond() { return error_.empty(); }
 | 
| @@ -229,7 +229,8 @@ void BluetoothSocketUpdateFunction::Work() {
 | 
|  }
 | 
|  
 | 
|  BluetoothSocketSetPausedFunction::BluetoothSocketSetPausedFunction()
 | 
| -    : socket_event_dispatcher_(NULL) {}
 | 
| +    : socket_event_dispatcher_(nullptr) {
 | 
| +}
 | 
|  
 | 
|  BluetoothSocketSetPausedFunction::~BluetoothSocketSetPausedFunction() {}
 | 
|  
 | 
| @@ -238,7 +239,7 @@ bool BluetoothSocketSetPausedFunction::Prepare() {
 | 
|    EXTENSION_FUNCTION_VALIDATE(params_.get());
 | 
|  
 | 
|    socket_event_dispatcher_ = GetSocketEventDispatcher(browser_context());
 | 
| -  return socket_event_dispatcher_ != NULL;
 | 
| +  return socket_event_dispatcher_ != nullptr;
 | 
|  }
 | 
|  
 | 
|  void BluetoothSocketSetPausedFunction::Work() {
 | 
| @@ -268,7 +269,7 @@ bool BluetoothSocketListenFunction::Prepare() {
 | 
|    if (!CreateParams())
 | 
|      return false;
 | 
|    socket_event_dispatcher_ = GetSocketEventDispatcher(browser_context());
 | 
| -  return socket_event_dispatcher_ != NULL;
 | 
| +  return socket_event_dispatcher_ != nullptr;
 | 
|  }
 | 
|  
 | 
|  void BluetoothSocketListenFunction::AsyncWorkStart() {
 | 
| @@ -448,7 +449,7 @@ bool BluetoothSocketAbstractConnectFunction::Prepare() {
 | 
|    EXTENSION_FUNCTION_VALIDATE(params_.get());
 | 
|  
 | 
|    socket_event_dispatcher_ = GetSocketEventDispatcher(browser_context());
 | 
| -  return socket_event_dispatcher_ != NULL;
 | 
| +  return socket_event_dispatcher_ != nullptr;
 | 
|  }
 | 
|  
 | 
|  void BluetoothSocketAbstractConnectFunction::AsyncWorkStart() {
 | 
| @@ -660,7 +661,7 @@ bool BluetoothSocketGetSocketsFunction::Prepare() { return true; }
 | 
|  void BluetoothSocketGetSocketsFunction::Work() {
 | 
|    std::vector<linked_ptr<bluetooth_socket::SocketInfo> > socket_infos;
 | 
|    base::hash_set<int>* resource_ids = GetSocketIds();
 | 
| -  if (resource_ids != NULL) {
 | 
| +  if (resource_ids != nullptr) {
 | 
|      for (base::hash_set<int>::iterator it = resource_ids->begin();
 | 
|           it != resource_ids->end();
 | 
|           ++it) {
 | 
| 
 |