commit cc225ef3b77b5e098cc12c661a947e1737480777
author Ben Chan <benchan@chromium.org> Tue Sep 30 13:26:51 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 03 09:09:36 2014 +0000
tree 83ea29fbc20631ef40b6887e72cb70a22892a135
parent f8a2ce10fbcd9b5b1a6776e93997833599a1575f

shill: Replace NULL with nullptr.

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

Change-Id: I30ab47ff32dcadad09ae7a2baf4d4123a6ef0d8e
Reviewed-on: https://chromium-review.googlesource.com/220657
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

service_property_change_test.cc

diff --git a/service_property_change_test.cc b/service_property_change_test.cc
index 42d2b2a..c2d9f6c 100644
--- a/service_property_change_test.cc
+++ b/service_property_change_test.cc
@@ -52,7 +52,7 @@
   Mock::VerifyAndClearExpectations(adaptor);
 
   // Depending on our caller, AutoConnect may be true.
-  service->ClearAutoConnect(NULL);
+  service->ClearAutoConnect(nullptr);
   EXPECT_FALSE(service->auto_connect());
   EXPECT_CALL(*adaptor, EmitBoolChanged(kAutoConnectProperty, _));
   service->SetAutoConnect(true);
@@ -149,9 +149,7 @@
   {
     Error error;
     scoped_refptr<MockProfile> profile(
-        new NiceMock<MockProfile>(static_cast<ControlInterface *>(NULL),
-                                  static_cast<Metrics *>(NULL),
-                                  static_cast<Manager *>(NULL)));
+        new NiceMock<MockProfile>(nullptr, nullptr, nullptr));
     service->set_profile(profile);
     EXPECT_FALSE(service->SetProfileRpcId(profile->GetRpcIdentifier(),
                                            &error));