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

chromeos/network/network_configuration_handler_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 182 matching lines @@
     dbus_setter->SetShillServiceClient(
         std::unique_ptr<ShillServiceClient>(mock_service_client_));
 
     EXPECT_CALL(*mock_service_client_, GetProperties(_, _)).Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, GetProperties(_)).Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_))
         .Times(AnyNumber());
     EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_))
         .Times(AnyNumber());
 
-    network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
+    network_state_handler_ = NetworkStateHandler::InitializeForTest();
     network_configuration_handler_.reset(new NetworkConfigurationHandler());
     network_configuration_handler_->Init(network_state_handler_.get(),
                                          NULL /* network_device_handler */);
     base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
     network_configuration_handler_.reset();
     network_state_handler_.reset();
     DBusThreadManager::Shutdown();
@@ skipping 274 matching lines @@
 
 class NetworkConfigurationHandlerStubTest : public testing::Test {
  public:
   NetworkConfigurationHandlerStubTest() {}
 
   ~NetworkConfigurationHandlerStubTest() override {}
 
   void SetUp() override {
     DBusThreadManager::Initialize();
 
-    network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
+    network_state_handler_ = NetworkStateHandler::InitializeForTest();
     test_observer_.reset(new TestObserver());
     network_state_handler_->AddObserver(test_observer_.get(), FROM_HERE);
 
     network_configuration_handler_.reset(new NetworkConfigurationHandler());
     network_configuration_handler_->Init(network_state_handler_.get(),
                                          NULL /* network_device_handler */);
 
     base::RunLoop().RunUntilIdle();
     test_observer_->ClearPropertyUpdates();
   }
@@ skipping 234 matching lines @@
   EXPECT_FALSE(test_observer->HasConfiguration(service_path));
   EXPECT_FALSE(test_observer->HasConfigurationInProfile(
       service_path, NetworkProfileHandler::GetSharedProfilePath()));
   EXPECT_FALSE(
       test_observer->HasConfigurationInProfile(service_path, user_profile));
 
   network_configuration_handler_->RemoveObserver(test_observer.get());
 }
 
 }  // namespace chromeos