commit ea18c6c99743aeee9b2e544532ef9fe55dbd182d
author Ben Chan <benchan@chromium.org> Tue Sep 30 13:08:26 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 03 09:09:18 2014 +0000
tree 26273dfa0b3753406e8d325ef98cba0c8db9c4c1
parent 53cc894f1ca677f930da7fce1564db44a7b02791

shill: cellular: Replace NULL with nullptr.

BUG=None
TEST=`USE=cellular FEATURES=test emerge-$BOARD shill`

Change-Id: I5b4fc9d5326a18aaac8e26b13335cb665e18ee7c
Reviewed-on: https://chromium-review.googlesource.com/220653
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular_capability_gsm_unittest.cc

diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index 9cf7fe9..7436eae 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -44,15 +44,15 @@
 class CellularCapabilityGSMTest : public testing::Test {
  public:
   CellularCapabilityGSMTest()
-      : modem_info_(NULL, &dispatcher_, NULL, NULL, NULL),
+      : modem_info_(nullptr, &dispatcher_, nullptr, nullptr, nullptr),
         create_card_proxy_from_factory_(false),
         proxy_(new MockModemProxy()),
         simple_proxy_(new MockModemSimpleProxy()),
         card_proxy_(new MockModemGSMCardProxy()),
         network_proxy_(new MockModemGSMNetworkProxy()),
         proxy_factory_(this),
-        capability_(NULL),
-        device_adaptor_(NULL),
+        capability_(nullptr),
+        device_adaptor_(nullptr),
         cellular_(new Cellular(&modem_info_,
                                "",
                                kAddress,
@@ -62,16 +62,16 @@
                                "",
                                "",
                                &proxy_factory_)),
-        mock_home_provider_info_(NULL),
-        mock_serving_operator_info_(NULL) {
+        mock_home_provider_info_(nullptr),
+        mock_serving_operator_info_(nullptr) {
     modem_info_.metrics()->RegisterDevice(cellular_->interface_index(),
                                           Technology::kCellular);
   }
 
   virtual ~CellularCapabilityGSMTest() {
-    cellular_->service_ = NULL;
-    capability_ = NULL;
-    device_adaptor_ = NULL;
+    cellular_->service_ = nullptr;
+    capability_ = nullptr;
+    device_adaptor_ = nullptr;
   }
 
   virtual void SetUp() {
@@ -197,12 +197,12 @@
     virtual ModemGSMCardProxyInterface *CreateModemGSMCardProxy(
         const string &/*path*/,
         const string &/*service*/) {
-      // TODO(benchan): This code conditionally returns a NULL pointer to avoid
+      // TODO(benchan): This code conditionally returns a nullptr to avoid
       // CellularCapabilityGSM::InitProperties (and thus
       // CellularCapabilityGSM::GetIMSI) from being called during the
       // construction. Remove this workaround after refactoring the tests.
       return test_->create_card_proxy_from_factory_ ?
-          test_->card_proxy_.release() : NULL;
+          test_->card_proxy_.release() : nullptr;
     }
 
     virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(