Remove implicit conversions from scoped_refptr to T* in chromeos/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a ChromeOS build.

BUG=110610

Review URL: https://codereview.chromium.org/560903003

Cr-Commit-Position: refs/heads/master@{#294278}

11 files changed, 66 insertions, 47 deletions

diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
index e3baacc..24ec490 100644
--- a/chromeos/accelerometer/accelerometer_reader.cc
+++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -159,7 +159,7 @@ AccelerometerReader::AccelerometerReader(
       delegate_(delegate),
       configuration_(new AccelerometerReader::Configuration()),
       weak_factory_(this) {
-  DCHECK(task_runner_);
+  DCHECK(task_runner_.get());
   DCHECK(delegate_);
   // Asynchronously detect and initialize the accelerometer to avoid delaying
   // startup.
@@ -184,10 +184,12 @@ void AccelerometerReader::TriggerRead() {
 
   scoped_refptr<AccelerometerReader::Reading> reading(
       new AccelerometerReader::Reading());
-  base::PostTaskAndReplyWithResult(task_runner_, FROM_HERE,
-      base::Bind(&ReadAccelerometer, reading),
-      base::Bind(&AccelerometerReader::OnDataRead,
-          weak_factory_.GetWeakPtr(), reading));
+  base::PostTaskAndReplyWithResult(task_runner_.get(),
+                                   FROM_HERE,
+                                   base::Bind(&ReadAccelerometer, reading),
+                                   base::Bind(&AccelerometerReader::OnDataRead,
+                                              weak_factory_.GetWeakPtr(),
+                                              reading));
 }
 
 void AccelerometerReader::OnDataRead(
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc
index 5d957b3..81dc99c 100644
--- a/chromeos/cert_loader_unittest.cc
+++ b/chromeos/cert_loader_unittest.cc
@@ -149,10 +149,12 @@ class CertLoaderTest : public testing::Test,
     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());
   }
 
@@ -202,14 +204,16 @@ TEST_F(CertLoaderTest, CertLoaderUpdatesCertListOnNewCert) {
 
   // 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) {
@@ -224,7 +228,8 @@ TEST_F(CertLoaderTest, CertLoaderNoUpdateOnSecondaryDbChanges) {
 
   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) {
@@ -239,7 +244,8 @@ TEST_F(CertLoaderTest, ClientLoaderUpdateOnNewClientCert) {
   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) {
@@ -256,7 +262,8 @@ TEST_F(CertLoaderTest, CertLoaderNoUpdateOnNewClientCertInSecondaryDb) {
 
   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) {
@@ -270,15 +277,17 @@ TEST_F(CertLoaderTest, UpdatedOnCertRemoval) {
   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) {
@@ -289,13 +298,14 @@ TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) {
 
   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());
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 1df4d0e..6175d6b 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -86,7 +86,7 @@ DBusThreadManager::~DBusThreadManager() {
 
   // Shut down the bus. During the browser shutdown, it's ok to shut down
   // the bus synchronously.
-  if (system_bus_)
+  if (system_bus_.get())
     system_bus_->ShutdownOnDBusThreadAndBlock();
 
   // Stop the D-Bus thread.
diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc
index 4f60526..ec6a679 100644
--- a/chromeos/dbus/debug_daemon_client.cc
+++ b/chromeos/dbus/debug_daemon_client.cc
@@ -233,7 +233,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
     // Create dbus::FileDescriptor on the worker thread; on return we'll
     // issue the D-Bus request to stop tracing and collect results.
     base::PostTaskAndReplyWithResult(
-        task_runner,
+        task_runner.get(),
         FROM_HERE,
         base::Bind(
             &DebugDaemonClientImpl::CreateFileDescriptorToStopSystemTracing,
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 537d573..aea5431 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -618,7 +618,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
     base::FilePath device_policy_path =
         owner_key_path.DirName().AppendASCII("stub_device_policy");
     base::PostTaskAndReplyWithResult(
-        base::WorkerPool::GetTaskRunner(false),
+        base::WorkerPool::GetTaskRunner(false).get(),
         FROM_HERE,
         base::Bind(&GetFileContent, device_policy_path),
         callback);
@@ -627,7 +627,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
       const std::string& username,
       const RetrievePolicyCallback& callback) OVERRIDE {
     base::PostTaskAndReplyWithResult(
-        base::WorkerPool::GetTaskRunner(false),
+        base::WorkerPool::GetTaskRunner(false).get(),
         FROM_HERE,
         base::Bind(&GetFileContent, GetUserFilePath(username, "stub_policy")),
         callback);
diff --git a/chromeos/network/client_cert_resolver.cc b/chromeos/network/client_cert_resolver.cc
index d345317..a416061 100644
--- a/chromeos/network/client_cert_resolver.cc
+++ b/chromeos/network/client_cert_resolver.cc
@@ -151,7 +151,7 @@ std::vector<CertAndIssuer> CreateSortedCertAndIssuerList(
         net::X509Certificate::CreateFromHandle(
             issuer_handle.get(),
             net::X509Certificate::OSCertHandles() /* no intermediate certs */);
-    if (!issuer) {
+    if (!issuer.get()) {
       LOG(ERROR) << "Couldn't create issuer cert.";
       continue;
     }
@@ -410,7 +410,8 @@ void ClientCertResolver::ResolveNetworks(
   VLOG(2) << "Start task for resolving client cert patterns.";
   base::TaskRunner* task_runner = slow_task_runner_for_test_.get();
   if (!task_runner)
-    task_runner = base::WorkerPool::GetTaskRunner(true /* task is slow */);
+    task_runner =
+        base::WorkerPool::GetTaskRunner(true /* task is slow */).get();
 
   NetworkCertMatches* matches = new NetworkCertMatches;
   task_runner->PostTaskAndReply(
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index 20f1b85..d426c97 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];
   }
diff --git a/chromeos/network/network_cert_migrator.cc b/chromeos/network/network_cert_migrator.cc
index 31f476a..1b50820 100644
--- a/chromeos/network/network_cert_migrator.cc
+++ b/chromeos/network/network_cert_migrator.cc
@@ -129,7 +129,7 @@ class NetworkCertMigrator::MigrationTask
     int real_slot_id = -1;
     scoped_refptr<net::X509Certificate> cert =
         FindCertificateWithPkcs11Id(pkcs11_id, &real_slot_id);
-    if (!cert) {
+    if (!cert.get()) {
       LOG(WARNING) << "No matching cert found, removing the certificate "
                       "configuration from network " << service_path;
       chromeos::client_cert::SetEmptyShillProperties(config_type,
@@ -141,7 +141,7 @@ class NetworkCertMigrator::MigrationTask
       return;
     }
 
-    if (cert && real_slot_id != configured_slot_id) {
+    if (cert.get() && real_slot_id != configured_slot_id) {
       VLOG(1) << "Network " << service_path
               << " is configured with no or an incorrect slot id.";
       chromeos::client_cert::SetShillProperties(
@@ -174,7 +174,7 @@ class NetworkCertMigrator::MigrationTask
 
     scoped_refptr<net::X509Certificate> cert =
         FindCertificateWithNickname(nickname);
-    if (!cert) {
+    if (!cert.get()) {
       VLOG(2) << "No matching cert found.";
       return;
     }
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index 0c5d6ee..88dec4f 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()));
   }
 
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc
index 5a1f577..91dbe22 100644
--- a/chromeos/network/network_connection_handler_unittest.cc
+++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -230,9 +230,11 @@ class NetworkConnectionHandlerTest : public testing::Test {
     net::CertificateList loaded_certs;
     scoped_refptr<net::CryptoModule> module(net::CryptoModule::CreateFromHandle(
         test_nssdb_->GetPrivateSlot().get()));
-    if (test_nssdb_->ImportFromPKCS12(
-            module, pkcs12_data, base::string16(), false, &loaded_certs) !=
-        net::OK) {
+    if (test_nssdb_->ImportFromPKCS12(module.get(),
+                                      pkcs12_data,
+                                      base::string16(),
+                                      false,
+                                      &loaded_certs) != net::OK) {
       LOG(ERROR) << "Error while importing to NSSDB.";
       return NULL;
     }
@@ -371,7 +373,7 @@ TEST_F(NetworkConnectionHandlerTest, ConnectCertificateMissing) {
 TEST_F(NetworkConnectionHandlerTest, ConnectWithCertificateSuccess) {
   StartCertLoader();
   scoped_refptr<net::X509Certificate> cert = ImportTestClientCert();
-  ASSERT_TRUE(cert);
+  ASSERT_TRUE(cert.get());
 
   SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate,
                                  cert->subject().common_name.c_str()),
@@ -386,7 +388,7 @@ TEST_F(NetworkConnectionHandlerTest, ConnectWithCertificateSuccess) {
 TEST_F(NetworkConnectionHandlerTest,
        DISABLED_ConnectWithCertificateRequestedBeforeCertsAreLoaded) {
   scoped_refptr<net::X509Certificate> cert = ImportTestClientCert();
-  ASSERT_TRUE(cert);
+  ASSERT_TRUE(cert.get());
 
   SetupPolicy(base::StringPrintf(kPolicyWithCertPatternTemplate,
                                  cert->subject().common_name.c_str()),
diff --git a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
index bb05d14..158b29b 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
+++ b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
@@ -131,8 +131,8 @@ class ONCCertificateImporterImplTest : public testing::Test {
 
     if (expected_type == net::SERVER_CERT || expected_type == net::CA_CERT) {
       EXPECT_EQ(1u, imported_server_and_ca_certs_.size());
-      EXPECT_TRUE(imported_server_and_ca_certs_[*guid]->Equals(
-          public_list_[0]));
+      EXPECT_TRUE(
+          imported_server_and_ca_certs_[*guid]->Equals(public_list_[0].get()));
     } else {  // net::USER_CERT
       EXPECT_TRUE(imported_server_and_ca_certs_.empty());
     }