Remove implicit conversions from scoped_refptr to T* in chrome/browser/sync_file_system/

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

BUG=110610

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

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

chrome/browser/sync_file_system/drive_backend/callback_helper.h

@@ -48,7 +48,7 @@ class CallbackHolder {
       : task_runner_(task_runner),
         from_here_(from_here),
         callback_(new base::Callback<T>(callback)) {
-    DCHECK(task_runner_);
+    DCHECK(task_runner_.get());
   }
 
   ~CallbackHolder() {
@@ -57,7 +57,7 @@ class CallbackHolder {
       delete callback;
   }
 
-  base::SequencedTaskRunner* task_runner() const { return task_runner_; }
+  base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); }
   const tracked_objects::Location& from_here() const { return from_here_; }
   const base::Callback<T>& callback() const { return *callback_; }
 

chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc

@@ -75,14 +75,13 @@ TEST(DriveBackendCallbackHelperTest, RunOnOtherThreadTest) {
   worker_task_runner->PostTask(
       FROM_HERE,
       RelayCallbackToTaskRunner(
-          ui_task_runner, FROM_HERE,
-          base::Bind(&VerifyCalledOnTaskRunner,
-                     ui_task_runner, &called)));
+          ui_task_runner.get(),
+          FROM_HERE,
+          base::Bind(&VerifyCalledOnTaskRunner, ui_task_runner, &called)));
   worker_task_runner->PostTask(
       FROM_HERE,
       RelayCallbackToTaskRunner(
-          ui_task_runner, FROM_HERE,
-          run_loop.QuitClosure()));
+          ui_task_runner.get(), FROM_HERE, run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(called);
 

chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

@@ -112,10 +112,10 @@ class DriveBackendSyncTest : public testing::Test,
         drive_service.get(), uploader.get(),
         kSyncRootFolderTitle));
 
-    remote_sync_service_.reset(new SyncEngine(
-        base::ThreadTaskRunnerHandle::Get(),  // ui_task_runner
-        worker_task_runner_,
-        drive_task_runner,
+    remote_sync_service_.reset(
+        new SyncEngine(base::ThreadTaskRunnerHandle::Get(),  // ui_task_runner
+                       worker_task_runner_.get(),
+                       drive_task_runner.get(),
                        base_dir_.path(),
                        NULL,  // task_logger
                        NULL,  // notification_manager
@@ -182,15 +182,14 @@ class DriveBackendSyncTest : public testing::Test,
     bool success = false;
     FileTracker tracker;
     PostTaskAndReplyWithResult(
-        worker_task_runner_,
+        worker_task_runner_.get(),
         FROM_HERE,
         base::Bind(&MetadataDatabase::FindAppRootTracker,
                    base::Unretained(metadata_database()),
                    app_id,
                    &tracker),
-        base::Bind(&SetValueAndCallClosure<bool>,
-                   run_loop.QuitClosure(),
-                   &success));
+        base::Bind(
+            &SetValueAndCallClosure<bool>, run_loop.QuitClosure(), &success));
     run_loop.Run();
     if (!success)
       return false;
@@ -211,7 +210,7 @@ class DriveBackendSyncTest : public testing::Test,
     base::FilePath result_path;
     base::FilePath normalized_path = path.NormalizePathSeparators();
     PostTaskAndReplyWithResult(
-        worker_task_runner_,
+        worker_task_runner_.get(),
         FROM_HERE,
         base::Bind(&MetadataDatabase::FindNearestActiveAncestor,
                    base::Unretained(metadata_database()),
@@ -219,9 +218,8 @@ class DriveBackendSyncTest : public testing::Test,
                    normalized_path,
                    &tracker,
                    &result_path),
-        base::Bind(&SetValueAndCallClosure<bool>,
-                   run_loop.QuitClosure(),
-                   &success));
+        base::Bind(
+            &SetValueAndCallClosure<bool>, run_loop.QuitClosure(), &success));
     run_loop.Run();
     EXPECT_TRUE(success);
     EXPECT_EQ(normalized_path, result_path);
@@ -379,7 +377,7 @@ class DriveBackendSyncTest : public testing::Test,
         base::RunLoop run_loop;
         int64 largest_fetched_change_id = -1;
         PostTaskAndReplyWithResult(
-            worker_task_runner_,
+            worker_task_runner_.get(),
             FROM_HERE,
             base::Bind(&MetadataDatabase::GetLargestFetchedChangeID,
                        base::Unretained(metadata_database())),
@@ -565,13 +563,12 @@ class DriveBackendSyncTest : public testing::Test,
     size_t count = 0;
     base::RunLoop run_loop;
     PostTaskAndReplyWithResult(
-        worker_task_runner_,
+        worker_task_runner_.get(),
         FROM_HERE,
         base::Bind(&MetadataDatabase::CountFileMetadata,
                    base::Unretained(metadata_database())),
-        base::Bind(&SetValueAndCallClosure<size_t>,
-                   run_loop.QuitClosure(),
-                   &count));
+        base::Bind(
+            &SetValueAndCallClosure<size_t>, run_loop.QuitClosure(), &count));
     run_loop.Run();
     return count;
   }
@@ -580,12 +577,12 @@ class DriveBackendSyncTest : public testing::Test,
     size_t count = 0;
     base::RunLoop run_loop;
     PostTaskAndReplyWithResult(
-        worker_task_runner_,
+        worker_task_runner_.get(),
         FROM_HERE,
         base::Bind(&MetadataDatabase::CountFileTracker,
                    base::Unretained(metadata_database())),
-        base::Bind(&SetValueAndCallClosure<size_t>,
-                   run_loop.QuitClosure(), &count));
+        base::Bind(
+            &SetValueAndCallClosure<size_t>, run_loop.QuitClosure(), &count));
     run_loop.Run();
     return count;
   }

chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc

@@ -44,9 +44,7 @@ google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
                  directory_title,
                  options,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -64,9 +62,7 @@ google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
                  resource_id,
                  etag,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -81,22 +77,17 @@ google_apis::CancelCallback DriveServiceOnWorker::DownloadFile(
 
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&DriveServiceWrapper::DownloadFile,
+      base::Bind(
+          &DriveServiceWrapper::DownloadFile,
           wrapper_,
           local_cache_path,
           resource_id,
           RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     download_action_callback),
+              worker_task_runner_.get(), FROM_HERE, download_action_callback),
           RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     get_content_callback),
+              worker_task_runner_.get(), FROM_HERE, get_content_callback),
           RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     progress_callback)));
+              worker_task_runner_.get(), FROM_HERE, progress_callback)));
 
   return google_apis::CancelCallback();
 }
@@ -110,9 +101,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource(
       base::Bind(&DriveServiceWrapper::GetAboutResource,
                  wrapper_,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -128,9 +117,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetChangeList(
                  wrapper_,
                  start_changestamp,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -146,9 +133,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
                  wrapper_,
                  next_link,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -170,9 +155,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
                  wrapper_,
                  next_link,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -189,9 +172,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
                  wrapper_,
                  resource_id,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -207,9 +188,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
                  wrapper_,
                  directory_resource_id,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -227,9 +206,7 @@ google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
                  parent_resource_id,
                  resource_id,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -247,9 +224,7 @@ google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
                  title,
                  directory_resource_id,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }

chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc

@@ -48,9 +48,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadNewFile(
                  content_type,
                  options,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }
@@ -73,9 +71,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadExistingFile(
                  content_type,
                  options,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 
   return google_apis::CancelCallback();
 }

chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc

@@ -41,9 +41,7 @@ void RemoteChangeProcessorOnWorker::PrepareForProcessRemoteChange(
                  wrapper_,
                  url,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 }
 
 void RemoteChangeProcessorOnWorker::ApplyRemoteChange(
@@ -61,9 +59,7 @@ void RemoteChangeProcessorOnWorker::ApplyRemoteChange(
                  local_path,
                  url,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 }
 
 void RemoteChangeProcessorOnWorker::FinalizeRemoteSync(
@@ -74,14 +70,13 @@ void RemoteChangeProcessorOnWorker::FinalizeRemoteSync(
 
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&RemoteChangeProcessorWrapper::FinalizeRemoteSync,
+      base::Bind(
+          &RemoteChangeProcessorWrapper::FinalizeRemoteSync,
           wrapper_,
           url,
           clear_local_changes,
           RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     completion_callback)));
+              worker_task_runner_.get(), FROM_HERE, completion_callback)));
 }
 
 void RemoteChangeProcessorOnWorker::RecordFakeLocalChange(
@@ -97,9 +92,7 @@ void RemoteChangeProcessorOnWorker::RecordFakeLocalChange(
                  url,
                  change,
                  RelayCallbackToTaskRunner(
-                     worker_task_runner_,
-                     FROM_HERE,
-                     callback)));
+                     worker_task_runner_.get(), FROM_HERE, callback)));
 }
 
 void RemoteChangeProcessorOnWorker::DetachFromSequence() {

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

@@ -216,16 +216,16 @@ scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
       context->GetRequestContext();
 
   scoped_ptr<drive_backend::SyncEngine> sync_engine(
-      new SyncEngine(ui_task_runner,
-                     worker_task_runner,
-                     drive_task_runner,
+      new SyncEngine(ui_task_runner.get(),
+                     worker_task_runner.get(),
+                     drive_task_runner.get(),
                      GetSyncFileSystemDir(context->GetPath()),
                      task_logger,
                      notification_manager,
                      extension_service,
                      signin_manager,
                      token_service,
-                     request_context,
+                     request_context.get(),
                      make_scoped_ptr(new DriveServiceFactory()),
                      NULL /* env_override */));
 
@@ -257,9 +257,10 @@ void SyncEngine::Reset() {
   if (drive_service_)
     drive_service_->RemoveObserver(this);
 
-  DeleteSoon(FROM_HERE, worker_task_runner_, sync_worker_.Pass());
-  DeleteSoon(FROM_HERE, worker_task_runner_, worker_observer_.Pass());
-  DeleteSoon(FROM_HERE, worker_task_runner_,
+  DeleteSoon(FROM_HERE, worker_task_runner_.get(), sync_worker_.Pass());
+  DeleteSoon(FROM_HERE, worker_task_runner_.get(), worker_observer_.Pass());
+  DeleteSoon(FROM_HERE,
+             worker_task_runner_.get(),
              remote_change_processor_on_worker_.Pass());
 
   drive_service_wrapper_.reset();
@@ -280,9 +281,9 @@ void SyncEngine::Initialize() {
   DCHECK(drive_service_factory_);
   scoped_ptr<drive::DriveServiceInterface> drive_service =
       drive_service_factory_->CreateDriveService(
-          token_service_, request_context_, drive_task_runner_);
+          token_service_, request_context_.get(), drive_task_runner_.get());
   scoped_ptr<drive::DriveUploaderInterface> drive_uploader(
-      new drive::DriveUploader(drive_service.get(), drive_task_runner_));
+      new drive::DriveUploader(drive_service.get(), drive_task_runner_.get()));
 
   InitializeInternal(drive_service.Pass(), drive_uploader.Pass(),
                      scoped_ptr<SyncWorkerInterface>());
@@ -317,21 +318,21 @@ void SyncEngine::InitializeInternal(
   // between DriveService and syncers in SyncWorker.
   scoped_ptr<drive::DriveServiceInterface> drive_service_on_worker(
       new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(),
-                               ui_task_runner_,
-                               worker_task_runner_));
+                               ui_task_runner_.get(),
+                               worker_task_runner_.get()));
   scoped_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker(
       new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(),
-                                ui_task_runner_,
-                                worker_task_runner_));
+                                ui_task_runner_.get(),
+                                worker_task_runner_.get()));
   scoped_ptr<SyncEngineContext> sync_engine_context(
       new SyncEngineContext(drive_service_on_worker.Pass(),
                             drive_uploader_on_worker.Pass(),
                             task_logger_,
-                            ui_task_runner_,
-                            worker_task_runner_));
+                            ui_task_runner_.get(),
+                            worker_task_runner_.get()));
 
-  worker_observer_.reset(
-      new WorkerObserver(ui_task_runner_, weak_ptr_factory_.GetWeakPtr()));
+  worker_observer_.reset(new WorkerObserver(ui_task_runner_.get(),
+                                            weak_ptr_factory_.GetWeakPtr()));
 
   base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr;
   if (extension_service_)
@@ -493,7 +494,8 @@ void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) {
 
   remote_change_processor_on_worker_.reset(new RemoteChangeProcessorOnWorker(
       remote_change_processor_wrapper_->AsWeakPtr(),
-      ui_task_runner_, worker_task_runner_));
+      ui_task_runner_.get(),
+      worker_task_runner_.get()));
 
   worker_task_runner_->PostTask(
       FROM_HERE,
@@ -548,8 +550,7 @@ void SyncEngine::DumpFiles(const GURL& origin,
   ListCallback tracked_callback =
       callback_tracker_.Register(abort_closure, callback);
 
-  PostTaskAndReplyWithResult(
-      worker_task_runner_,
+  PostTaskAndReplyWithResult(worker_task_runner_.get(),
                              FROM_HERE,
                              base::Bind(&SyncWorkerInterface::DumpFiles,
                                         base::Unretained(sync_worker_.get()),
@@ -569,8 +570,7 @@ void SyncEngine::DumpDatabase(const ListCallback& callback) {
   ListCallback tracked_callback =
       callback_tracker_.Register(abort_closure, callback);
 
-  PostTaskAndReplyWithResult(
-      worker_task_runner_,
+  PostTaskAndReplyWithResult(worker_task_runner_.get(),
                              FROM_HERE,
                              base::Bind(&SyncWorkerInterface::DumpDatabase,
                                         base::Unretained(sync_worker_.get())),

chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc

@@ -45,8 +45,8 @@ class SyncEngineTest : public testing::Test,
             base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 
     sync_engine_.reset(new drive_backend::SyncEngine(
-        ui_task_runner,
-        worker_task_runner_,
+        ui_task_runner.get(),
+        worker_task_runner_.get(),
         NULL /* drive_task_runner */,
         profile_dir_.path(),
         NULL /* task_logger */,
@@ -103,7 +103,7 @@ class SyncEngineTest : public testing::Test,
   }
 
   void WaitForWorkerTaskRunner() {
-    DCHECK(worker_task_runner_);
+    DCHECK(worker_task_runner_.get());
 
     base::RunLoop run_loop;
     worker_task_runner_->PostTask(

chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc

@@ -72,7 +72,7 @@ void SyncTaskManager::Initialize(SyncStatusCode status) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(!token_);
   NotifyTaskDone(
-      SyncTaskToken::CreateForForegroundTask(AsWeakPtr(), task_runner_),
+      SyncTaskToken::CreateForForegroundTask(AsWeakPtr(), task_runner_.get()),
       status);
 }
 
@@ -327,9 +327,8 @@ void SyncTaskManager::UpdateBlockingFactorBody(
     foreground_task_token->clear_callback();
 
     background_task_token =
-        SyncTaskToken::CreateForBackgroundTask(
-            AsWeakPtr(),
-            task_runner_,
+        SyncTaskToken::CreateForBackgroundTask(AsWeakPtr(),
+                                               task_runner_.get(),
                                                task_token_seq_++,
                                                blocking_factor.Pass());
     background_task_token->UpdateTask(from_here, callback);

chrome/browser/sync_file_system/drive_backend/sync_task_token.cc

@@ -68,15 +68,17 @@ SyncTaskToken::~SyncTaskToken() {
   // it must return the token to TaskManager.
   // Destroying a token with valid |client| indicates the token was
   // dropped by a task without returning.
-  if (task_runner_ && task_runner_->RunsTasksOnCurrentThread() &&
+  if (task_runner_.get() && task_runner_->RunsTasksOnCurrentThread() &&
       manager_ && manager_->IsRunningTask(token_id_)) {
     NOTREACHED()
         << "Unexpected TaskToken deletion from: " << location_.ToString();
 
     // Reinitializes the token.
     SyncTaskManager::NotifyTaskDone(
-        make_scoped_ptr(new SyncTaskToken(
-            manager_, task_runner_, token_id_, blocking_factor_.Pass(),
+        make_scoped_ptr(new SyncTaskToken(manager_,
+                                          task_runner_.get(),
+                                          token_id_,
+                                          blocking_factor_.Pass(),
                                           SyncStatusCallback())),
         SYNC_STATUS_OK);
   }

chrome/browser/sync_file_system/local/root_delete_helper.cc

@@ -43,7 +43,7 @@ RootDeleteHelper::RootDeleteHelper(
       callback_(callback),
       sync_status_(sync_status),
       weak_factory_(this) {
-  DCHECK(file_system_context_);
+  DCHECK(file_system_context_.get());
   DCHECK(url_.is_valid());
   DCHECK(!callback_.is_null());
   DCHECK(sync_status_);

chrome/browser/sync_file_system/local/sync_file_system_backend.cc

@@ -230,7 +230,7 @@ void SyncFileSystemBackend::SetLocalFileChangeTracker(
 
 void SyncFileSystemBackend::set_sync_context(
     LocalFileSyncContext* sync_context) {
-  DCHECK(!sync_context_);
+  DCHECK(!sync_context_.get());
   sync_context_ = sync_context;
 }