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

Unified Diff: chromeos/network/network_cert_migrator_unittest.cc

Issue 560903003: Remove implicit conversions from scoped_refptr to T* in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/network_cert_migrator.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_cert_migrator_unittest.cc
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index 0c5d6eea2ca5ed3587b1a2c0aab0890f1c555a29..88dec4f6efcc6c3807815b63b949cc24bb4ded50 100644
--- a/chromeos/network/network_cert_migrator_unittest.cc
+++ b/chromeos/network/network_cert_migrator_unittest.cc
@@ -115,10 +115,12 @@ class NetworkCertMigratorTest : public testing::Test {
net::CertificateList client_cert_list;
scoped_refptr<net::CryptoModule> module(net::CryptoModule::CreateFromHandle(
test_nssdb_->GetPrivateSlot().get()));
- ASSERT_EQ(
- net::OK,
- test_nssdb_->ImportFromPKCS12(
- module, pkcs12_data, base::string16(), false, &client_cert_list));
+ ASSERT_EQ(net::OK,
+ test_nssdb_->ImportFromPKCS12(module.get(),
+ pkcs12_data,
+ base::string16(),
+ false,
+ &client_cert_list));
ASSERT_TRUE(!client_cert_list.empty());
test_client_cert_ = client_cert_list[0];
@@ -290,10 +292,10 @@ class NetworkCertMigratorTest : public testing::Test {
private:
void CleanupTestCert() {
- if (test_ca_cert_)
+ if (test_ca_cert_.get())
ASSERT_TRUE(test_nssdb_->DeleteCertAndKey(test_ca_cert_.get()));
- if (test_client_cert_)
+ if (test_client_cert_.get())
ASSERT_TRUE(test_nssdb_->DeleteCertAndKey(test_client_cert_.get()));
}
« no previous file with comments | « chromeos/network/network_cert_migrator.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698