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

chromeos/network/auto_connect_handler_unittest.cc

 // Copyright 2014 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/auto_connect_handler.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
-const char* kUserHash = "user_hash";
+const char kUserHash[] = "user_hash";
 
 void ConfigureCallback(const dbus::ObjectPath& result) {
 }
 
 void FailErrorCallback(const std::string& error_name,
                             const std::string& error_message) {
   // This function is not expected to be called.
   EXPECT_TRUE(false);
 }
 
@@ skipping 47 matching lines @@
         "/device/wifi1", shill::kTypeWifi, "wifi_device1");
     test_manager_client_->AddTechnology(shill::kTypeCellular,
                                         true /* enabled */);
     dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile(
         "shared_profile_path", std::string() /* shared profile */);
     dbus_manager->GetShillProfileClient()->GetTestInterface()->AddProfile(
         "user_profile_path", kUserHash);
 
     base::RunLoop().RunUntilIdle();
     LoginState::Initialize();
-    network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
+    network_state_handler_ = NetworkStateHandler::InitializeForTest();
     network_config_handler_.reset(
         NetworkConfigurationHandler::InitializeForTest(
             network_state_handler_.get(), NULL /* network_device_handler */));
 
     network_profile_handler_.reset(new NetworkProfileHandler());
     network_profile_handler_->Init();
 
     managed_config_handler_.reset(new ManagedNetworkConfigurationHandlerImpl());
     managed_config_handler_->Init(
         network_state_handler_.get(), network_profile_handler_.get(),
@@ skipping 379 matching lines @@
   // Applying the user policy after login would usually trigger connecting to
   // the 'best' network. But the manual connect prevents this.
   SetupPolicy(std::string(),            // no network configs
               base::DictionaryValue(),  // no global config
               true);                    // load as user policy
   EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0"));
   EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1"));
 }
 
 }  // namespace chromeos