Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: chromeos/network/client_cert_resolver_unittest.cc

Issue 2689223002: Defer NetworkConfigurationHandler::CreateShillConfiguration callback (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chromeos/network/client_cert_resolver.h" 4 #include "chromeos/network/client_cert_resolver.h"
5 5
6 #include <cert.h> 6 #include <cert.h>
7 #include <pk11pub.h> 7 #include <pk11pub.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 CertLoader::Initialize(); 81 CertLoader::Initialize();
82 cert_loader_ = CertLoader::Get(); 82 cert_loader_ = CertLoader::Get();
83 CertLoader::ForceHardwareBackedForTesting(); 83 CertLoader::ForceHardwareBackedForTesting();
84 } 84 }
85 85
86 void TearDown() override { 86 void TearDown() override {
87 client_cert_resolver_->RemoveObserver(this); 87 client_cert_resolver_->RemoveObserver(this);
88 client_cert_resolver_.reset(); 88 client_cert_resolver_.reset();
89 test_clock_.reset(); 89 test_clock_.reset();
90 network_state_handler_->Shutdown();
90 managed_config_handler_.reset(); 91 managed_config_handler_.reset();
91 network_config_handler_.reset(); 92 network_config_handler_.reset();
92 network_profile_handler_.reset(); 93 network_profile_handler_.reset();
93 network_state_handler_.reset(); 94 network_state_handler_.reset();
94 CertLoader::Shutdown(); 95 CertLoader::Shutdown();
95 DBusThreadManager::Shutdown(); 96 DBusThreadManager::Shutdown();
96 } 97 }
97 98
98 protected: 99 protected:
99 void StartCertLoader() { 100 void StartCertLoader() {
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 // substituted into the shill service entry. 438 // substituted into the shill service entry.
438 SetupPolicyMatchingIssuerPEM("upn-${CERT_SAN_UPN}-suffix"); 439 SetupPolicyMatchingIssuerPEM("upn-${CERT_SAN_UPN}-suffix");
439 base::RunLoop().RunUntilIdle(); 440 base::RunLoop().RunUntilIdle();
440 441
441 GetServiceProperty(shill::kEapIdentityProperty, &identity); 442 GetServiceProperty(shill::kEapIdentityProperty, &identity);
442 EXPECT_EQ("upn-santest@ad.corp.example.com-suffix", identity); 443 EXPECT_EQ("upn-santest@ad.corp.example.com-suffix", identity);
443 EXPECT_EQ(2, network_properties_changed_count_); 444 EXPECT_EQ(2, network_properties_changed_count_);
444 } 445 }
445 446
446 } // namespace chromeos 447 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/auto_connect_handler_unittest.cc ('k') | chromeos/network/host_resolver_impl_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698