NetworkStateHandler::InitializeForTest() should return a std::unique_ptr.

chromeos/network/network_state_handler.cc

Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index bf0681c27eb8410e736912e1161bcbe190a70756..74f6f4cdb9d25d914943073f6800b2879febc1c9 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -85,13 +85,14 @@ void NetworkStateHandler::Shutdown() {
 }
 
 void NetworkStateHandler::InitShillPropertyHandler() {
-  shill_property_handler_.reset(new internal::ShillPropertyHandler(this));
+  shill_property_handler_ =
+      base::MakeUnique<internal::ShillPropertyHandler>(this);
   shill_property_handler_->Init();
 }
 
 // static
-NetworkStateHandler* NetworkStateHandler::InitializeForTest() {
-  NetworkStateHandler* handler = new NetworkStateHandler();
+std::unique_ptr<NetworkStateHandler> NetworkStateHandler::InitializeForTest() {
+  auto handler = base::WrapUnique(new NetworkStateHandler());

[stevenjb, 2016/11/04 16:31:37]

My understanding is that MakeUnique<NetworkStateHandler>() is preferred here?

[Lei Zhang, 2016/11/04 18:30:37]

First thing I tried, but the ctor is private.

[stevenjb, 2016/11/04 18:33:31]

Ah, right, I remember that part of the discussion now. OK, cheers.

   handler->InitShillPropertyHandler();
   return handler;
 }
@@ -260,12 +261,9 @@ const NetworkState* NetworkStateHandler::FirstNetworkByType(
 
 std::string NetworkStateHandler::FormattedHardwareAddressForType(
     const NetworkTypePattern& type) const {
-  const DeviceState* device = nullptr;
   const NetworkState* network = ConnectedNetworkByType(type);
-  if (network)
-    device = GetDeviceState(network->device_path());
-  else
-    device = GetDeviceStateByType(type);
+  const DeviceState* device = network ? GetDeviceState(network->device_path())
+                                      : GetDeviceStateByType(type);
   if (!device)
     return std::string();
   return network_util::FormattedMacAddress(device->mac_address());