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

chromeos/network/network_cert_migrator_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_cert_migrator.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 #include <string>
 
@@ skipping 71 matching lines @@
 
     int slot_id = -1;
     test_client_cert_pkcs11_id_ = CertLoader::GetPkcs11IdAndSlotForCert(
         *test_client_cert_, &slot_id);
     ASSERT_FALSE(test_client_cert_pkcs11_id_.empty());
     ASSERT_NE(-1, slot_id);
     test_client_cert_slot_id_ = base::IntToString(slot_id);
   }
 
   void SetupNetworkHandlers() {
-    network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
+    network_state_handler_ = NetworkStateHandler::InitializeForTest();
     network_cert_migrator_.reset(new NetworkCertMigrator);
     network_cert_migrator_->Init(network_state_handler_.get());
   }
 
   void AddService(const std::string& network_id,
                   const std::string& type,
                   const std::string& state) {
     service_test_->AddService(network_id /* service_path */,
                               network_id /* guid */,
                               network_id /* name */,
@@ skipping 228 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   std::string pkcs11_id;
   std::string slot_id;
   GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);
   EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);
   EXPECT_EQ(test_client_cert_slot_id_, slot_id);
 }
 
 }  // namespace chromeos