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

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

Issue 2858113003: Enable device-wide EAP-TLS networks (Closed)
Patch Set: Addressed comments and fixed weak_ptr access from wrong thread. Created 3 years, 7 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 4
5 #include "chromeos/network/network_cert_migrator.h" 5 #include "chromeos/network/network_cert_migrator.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 DBusThreadManager::Get() 58 DBusThreadManager::Get()
59 ->GetShillProfileClient() 59 ->GetShillProfileClient()
60 ->GetTestInterface() 60 ->GetTestInterface()
61 ->AddProfile(kProfile, "" /* userhash */); 61 ->AddProfile(kProfile, "" /* userhash */);
62 base::RunLoop().RunUntilIdle(); 62 base::RunLoop().RunUntilIdle();
63 service_test_->ClearServices(); 63 service_test_->ClearServices();
64 base::RunLoop().RunUntilIdle(); 64 base::RunLoop().RunUntilIdle();
65 65
66 CertLoader::Initialize(); 66 CertLoader::Initialize();
67 CertLoader* cert_loader_ = CertLoader::Get(); 67 CertLoader* cert_loader_ = CertLoader::Get();
68 cert_loader_->StartWithNSSDB(test_nsscertdb_.get()); 68 cert_loader_->SetUserNSSDB(test_nsscertdb_.get());
69 } 69 }
70 70
71 void TearDown() override { 71 void TearDown() override {
72 network_state_handler_->Shutdown(); 72 network_state_handler_->Shutdown();
73 network_cert_migrator_.reset(); 73 network_cert_migrator_.reset();
74 network_state_handler_.reset(); 74 network_state_handler_.reset();
75 CertLoader::Shutdown(); 75 CertLoader::Shutdown();
76 DBusThreadManager::Shutdown(); 76 DBusThreadManager::Shutdown();
77 } 77 }
78 78
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 base::RunLoop().RunUntilIdle(); 333 base::RunLoop().RunUntilIdle();
334 334
335 std::string pkcs11_id; 335 std::string pkcs11_id;
336 std::string slot_id; 336 std::string slot_id;
337 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id); 337 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);
338 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id); 338 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);
339 EXPECT_EQ(test_client_cert_slot_id_, slot_id); 339 EXPECT_EQ(test_client_cert_slot_id_, slot_id);
340 } 340 }
341 341
342 } // namespace chromeos 342 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_cert_migrator.cc ('k') | chromeos/network/network_connection_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698