Defer NetworkConfigurationHandler::CreateShillConfiguration callback

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 190 matching lines @@
         .Times(AnyNumber());
 
     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_state_handler_->Shutdown();
     network_configuration_handler_.reset();
     network_state_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   // Handles responses for GetProperties method calls.
   void OnGetProperties(
       const dbus::ObjectPath& path,
       const ShillClientHelper::DictionaryValueCallback& callback) {
     callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_);
@@ skipping 280 matching lines @@
 
     network_configuration_handler_.reset(new NetworkConfigurationHandler());
     network_configuration_handler_->Init(network_state_handler_.get(),
                                          NULL /* network_device_handler */);
 
     base::RunLoop().RunUntilIdle();
     test_observer_->ClearPropertyUpdates();
   }
 
   void TearDown() override {
+    network_state_handler_->Shutdown();
     network_configuration_handler_.reset();
     network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE);
     network_state_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   void SuccessCallback(const std::string& callback_name) {
     success_callback_name_ = callback_name;
   }
 
@@ skipping 222 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