Defer NetworkConfigurationHandler::CreateShillConfiguration callback

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 49 matching lines @@
     base::RunLoop().RunUntilIdle();
     service_test_->ClearServices();
     base::RunLoop().RunUntilIdle();
 
     CertLoader::Initialize();
     CertLoader* cert_loader_ = CertLoader::Get();
     cert_loader_->StartWithNSSDB(test_nsscertdb_.get());
   }
 
   void TearDown() override {
+    network_state_handler_->Shutdown();
     network_cert_migrator_.reset();
     network_state_handler_.reset();
     CertLoader::Shutdown();
     DBusThreadManager::Shutdown();
   }
 
  protected:
   void SetupTestClientCert() {
     test_client_cert_ = net::ImportClientCertAndKeyFromFile(
         net::GetTestCertsDirectory(), "client_1.pem", "client_1.pk8",
@@ skipping 251 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