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

Unified Diff: chromeos/network/client_cert_resolver_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/client_cert_resolver.cc ('k') | chromeos/network/network_cert_migrator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/client_cert_resolver_unittest.cc
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index 20f1b85c70df34e40cfd343030c02696069e34c4..d426c97aacbaaad435c5a6af0c98354da43b39ec 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -100,7 +100,7 @@ class ClientCertResolverTest : public testing::Test {
protected:
void StartCertLoader() {
cert_loader_->StartWithNSSDB(test_nssdb_.get());
- if (test_client_cert_) {
+ if (test_client_cert_.get()) {
int slot_id = 0;
const std::string pkcs11_id =
CertLoader::GetPkcs11IdAndSlotForCert(*test_client_cert_, &slot_id);
@@ -136,10 +136,12 @@ class ClientCertResolverTest : public testing::Test {
net::CertificateList client_cert_list;
scoped_refptr<net::CryptoModule> module(
net::CryptoModule::CreateFromHandle(private_slot_.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];
}
« no previous file with comments | « chromeos/network/client_cert_resolver.cc ('k') | chromeos/network/network_cert_migrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698