Index: device/core/device_client.cc |
diff --git a/device/core/device_client.cc b/device/core/device_client.cc |
index 52021221d9f0fc84130109ba6846a7d3eafd0627..50b015e9ddc636a6a0e525d6e6bc3548a3b537ce 100644 |
--- a/device/core/device_client.cc |
+++ b/device/core/device_client.cc |
@@ -10,17 +10,16 @@ namespace device { |
namespace { |
-DeviceClient* g_instance = NULL; |
+DeviceClient* g_instance; |
} // namespace |
DeviceClient::DeviceClient() { |
- DCHECK(!g_instance); |
g_instance = this; |
} |
DeviceClient::~DeviceClient() { |
- g_instance = NULL; |
+ g_instance = nullptr; |
} |
/* static */ |
@@ -32,13 +31,13 @@ DeviceClient* DeviceClient::Get() { |
UsbService* DeviceClient::GetUsbService() { |
// This should never be called by clients which do not support the USB API. |
NOTREACHED(); |
- return NULL; |
+ return nullptr; |
} |
HidService* DeviceClient::GetHidService() { |
// This should never be called by clients which do not support the HID API. |
NOTREACHED(); |
- return NULL; |
+ return nullptr; |
} |
} // namespace device |