Remove implicit conversions from scoped_refptr to T* in chromeos/

chromeos/cert_loader_unittest.cc

 // Copyright 2014 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/cert_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 131 matching lines @@
     ASSERT_TRUE(imported_certs);
 
     std::string pkcs12_data;
     base::FilePath pkcs12_file_path =
         net::GetTestCertsDirectory().Append(pkcs12_file);
     ASSERT_TRUE(base::ReadFileToString(pkcs12_file_path, &pkcs12_data));
 
     net::CertificateList client_cert_list;
     scoped_refptr<net::CryptoModule> module(net::CryptoModule::CreateFromHandle(
         database->GetPrivateSlot().get()));
-    ASSERT_EQ(
-        net::OK,
-        database->ImportFromPKCS12(module, pkcs12_data, base::string16(), false,
-                                   imported_certs));
+    ASSERT_EQ(net::OK,
+              database->ImportFromPKCS12(module.get(),
+                                         pkcs12_data,
+                                         base::string16(),
+                                         false,
+                                         imported_certs));
     ASSERT_EQ(1U, imported_certs->size());
   }
 
   CertLoader* cert_loader_;
 
   // The user is primary as the one whose certificates CertLoader handles, it
   // has nothing to do with crypto::InitializeNSSForChromeOSUser is_primary_user
   // parameter (which is irrelevant for these tests).
   crypto::ScopedTestNSSChromeOSUser primary_user_;
   scoped_ptr<net::NSSCertDatabaseChromeOS> primary_db_;
@@ skipping 29 matching lines @@
 }
 
 TEST_F(CertLoaderTest, CertLoaderUpdatesCertListOnNewCert) {
   StartCertLoaderWithPrimaryUser();
 
   net::CertificateList certs;
   ImportCACert("root_ca_cert.pem", primary_db_.get(), &certs);
 
   // Certs are loaded asynchronously, so the new cert should not yet be in the
   // cert list.
-  EXPECT_FALSE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  EXPECT_FALSE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 
   ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 
   // The certificate list should be updated now, as the message loop's been run.
-  EXPECT_TRUE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  EXPECT_TRUE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 }
 
 TEST_F(CertLoaderTest, CertLoaderNoUpdateOnSecondaryDbChanges) {
   crypto::ScopedTestNSSChromeOSUser secondary_user("secondary");
   scoped_ptr<net::NSSCertDatabaseChromeOS> secondary_db;
 
   StartCertLoaderWithPrimaryUser();
   FinishUserInitAndGetDatabase(&secondary_user, &secondary_db);
 
   net::CertificateList certs;
   ImportCACert("root_ca_cert.pem", secondary_db.get(), &certs);
 
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_FALSE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  EXPECT_FALSE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 }
 
 TEST_F(CertLoaderTest, ClientLoaderUpdateOnNewClientCert) {
   StartCertLoaderWithPrimaryUser();
 
   net::CertificateList certs;
   ImportClientCertAndKey("websocket_client_cert.p12",
                          primary_db_.get(),
                          &certs);
 
   ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 
-  EXPECT_TRUE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  EXPECT_TRUE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 }
 
 TEST_F(CertLoaderTest, CertLoaderNoUpdateOnNewClientCertInSecondaryDb) {
   crypto::ScopedTestNSSChromeOSUser secondary_user("secondary");
   scoped_ptr<net::NSSCertDatabaseChromeOS> secondary_db;
 
   StartCertLoaderWithPrimaryUser();
   FinishUserInitAndGetDatabase(&secondary_user, &secondary_db);
 
   net::CertificateList certs;
   ImportClientCertAndKey("websocket_client_cert.p12",
                          secondary_db.get(),
                          &certs);
 
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_FALSE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  EXPECT_FALSE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 }
 
 TEST_F(CertLoaderTest, UpdatedOnCertRemoval) {
   StartCertLoaderWithPrimaryUser();
 
   net::CertificateList certs;
   ImportClientCertAndKey("websocket_client_cert.p12",
                          primary_db_.get(),
                          &certs);
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
-  ASSERT_TRUE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  ASSERT_TRUE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 
-  primary_db_->DeleteCertAndKey(certs[0]);
+  primary_db_->DeleteCertAndKey(certs[0].get());
 
   ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 
-  ASSERT_FALSE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  ASSERT_FALSE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 }
 
 TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) {
   StartCertLoaderWithPrimaryUser();
 
   net::CertificateList certs;
   ImportCACert("root_ca_cert.pem", primary_db_.get(), &certs);
 
   base::RunLoop().RunUntilIdle();
   ASSERT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
-  ASSERT_TRUE(IsCertInCertificateList(certs[0], cert_loader_->cert_list()));
+  ASSERT_TRUE(
+      IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list()));
 
   // The value that should have been set by |ImportCACert|.
   ASSERT_EQ(net::NSSCertDatabase::TRUST_DEFAULT,
-            primary_db_->GetCertTrust(certs[0], net::CA_CERT));
+            primary_db_->GetCertTrust(certs[0].get(), net::CA_CERT));
   ASSERT_TRUE(primary_db_->SetCertTrust(
-      certs[0], net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL));
+      certs[0].get(), net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL));
 
   // Cert trust change should trigger certificate reload in cert_loader_.
   ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 }
 
 }  // namespace
 }  // namespace chromeos