Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 35 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/blob/scoped_file.h"
 #include "storage/common/fileapi/file_system_util.h"
 
 namespace sync_file_system {
 
 class RemoteChangeProcessor;
 
 namespace drive_backend {
 
-scoped_ptr<drive::DriveServiceInterface>
+std::unique_ptr<drive::DriveServiceInterface>
 SyncEngine::DriveServiceFactory::CreateDriveService(
     OAuth2TokenService* oauth2_token_service,
     net::URLRequestContextGetter* url_request_context_getter,
     base::SequencedTaskRunner* blocking_task_runner) {
-  return scoped_ptr<drive::DriveServiceInterface>(
-      new drive::DriveAPIService(
-          oauth2_token_service,
-          url_request_context_getter,
-          blocking_task_runner,
-          GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
-          GURL(google_apis::DriveApiUrlGenerator::
-               kBaseDownloadUrlForProduction),
-          GURL(google_apis::DriveApiUrlGenerator::
-               kBaseThumbnailUrlForProduction),
-          std::string() /* custom_user_agent */));
+  return std::unique_ptr<
+      drive::DriveServiceInterface>(new drive::DriveAPIService(
+      oauth2_token_service, url_request_context_getter, blocking_task_runner,
+      GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
+      GURL(google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction),
+      GURL(google_apis::DriveApiUrlGenerator::kBaseThumbnailUrlForProduction),
+      std::string() /* custom_user_agent */));
 }
 
 class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer {
  public:
   WorkerObserver(base::SequencedTaskRunner* ui_task_runner,
                  base::WeakPtr<SyncEngine> sync_engine)
       : ui_task_runner_(ui_task_runner),
         sync_engine_(sync_engine) {
     sequence_checker_.DetachFromSequence();
   }
@@ skipping 70 matching lines @@
 void DidRegisterOrigin(const base::TimeTicks& start_time,
                        const SyncStatusCallback& callback,
                        SyncStatusCode status) {
   base::TimeDelta delta(base::TimeTicks::Now() - start_time);
   LOCAL_HISTOGRAM_TIMES("SyncFileSystem.RegisterOriginTime", delta);
   callback.Run(status);
 }
 
 }  // namespace
 
-scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
+std::unique_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
     content::BrowserContext* context,
     TaskLogger* task_logger) {
   scoped_refptr<base::SequencedWorkerPool> worker_pool =
       content::BrowserThread::GetBlockingPool();
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
       base::ThreadTaskRunnerHandle::Get();
   scoped_refptr<base::SequencedTaskRunner> worker_task_runner =
       worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
           worker_pool->GetSequenceToken(),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
   scoped_refptr<base::SequencedTaskRunner> drive_task_runner =
       worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
           worker_pool->GetSequenceToken(),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 
   Profile* profile = Profile::FromBrowserContext(context);
   drive::DriveNotificationManager* notification_manager =
       drive::DriveNotificationManagerFactory::GetForBrowserContext(context);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(context)->extension_service();
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   OAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   scoped_refptr<net::URLRequestContextGetter> request_context =
       context->GetRequestContext();
 
-  scoped_ptr<drive_backend::SyncEngine> sync_engine(
-      new SyncEngine(ui_task_runner.get(),
-                     worker_task_runner.get(),
-                     drive_task_runner.get(),
-                     worker_pool.get(),
-                     GetSyncFileSystemDir(context->GetPath()),
-                     task_logger,
-                     notification_manager,
-                     extension_service,
-                     signin_manager,
-                     token_service,
-                     request_context.get(),
-                     make_scoped_ptr(new DriveServiceFactory()),
-                     nullptr /* env_override */));
+  std::unique_ptr<drive_backend::SyncEngine> sync_engine(new SyncEngine(
+      ui_task_runner.get(), worker_task_runner.get(), drive_task_runner.get(),
+      worker_pool.get(), GetSyncFileSystemDir(context->GetPath()), task_logger,
+      notification_manager, extension_service, signin_manager, token_service,
+      request_context.get(), base::WrapUnique(new DriveServiceFactory()),
+      nullptr /* env_override */));
 
   sync_engine->Initialize();
   return sync_engine;
 }
 
 void SyncEngine::AppendDependsOnFactories(
     std::set<BrowserContextKeyedServiceFactory*>* factories) {
   DCHECK(factories);
   factories->insert(drive::DriveNotificationManagerFactory::GetInstance());
   factories->insert(SigninManagerFactory::GetInstance());
@@ skipping 29 matching lines @@
   callback_tracker_.AbortAll();
 }
 
 void SyncEngine::Initialize() {
   Reset();
 
   if (!signin_manager_ || !signin_manager_->IsAuthenticated())
     return;
 
   DCHECK(drive_service_factory_);
-  scoped_ptr<drive::DriveServiceInterface> drive_service =
+  std::unique_ptr<drive::DriveServiceInterface> drive_service =
       drive_service_factory_->CreateDriveService(
           token_service_, request_context_.get(), drive_task_runner_.get());
-  scoped_ptr<drive::DriveUploaderInterface> drive_uploader(
+  std::unique_ptr<drive::DriveUploaderInterface> drive_uploader(
       new drive::DriveUploader(drive_service.get(), drive_task_runner_.get()));
 
   InitializeInternal(std::move(drive_service), std::move(drive_uploader),
                      nullptr);
 }
 
 void SyncEngine::InitializeForTesting(
-    scoped_ptr<drive::DriveServiceInterface> drive_service,
-    scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
-    scoped_ptr<SyncWorkerInterface> sync_worker) {
+    std::unique_ptr<drive::DriveServiceInterface> drive_service,
+    std::unique_ptr<drive::DriveUploaderInterface> drive_uploader,
+    std::unique_ptr<SyncWorkerInterface> sync_worker) {
   Reset();
   InitializeInternal(std::move(drive_service), std::move(drive_uploader),
                      std::move(sync_worker));
 }
 
 void SyncEngine::InitializeInternal(
-    scoped_ptr<drive::DriveServiceInterface> drive_service,
-    scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
-    scoped_ptr<SyncWorkerInterface> sync_worker) {
+    std::unique_ptr<drive::DriveServiceInterface> drive_service,
+    std::unique_ptr<drive::DriveUploaderInterface> drive_uploader,
+    std::unique_ptr<SyncWorkerInterface> sync_worker) {
   drive_service_ = std::move(drive_service);
   drive_service_wrapper_.reset(new DriveServiceWrapper(drive_service_.get()));
 
   std::string account_id;
   if (signin_manager_)
     account_id = signin_manager_->GetAuthenticatedAccountId();
   drive_service_->Initialize(account_id);
 
   drive_uploader_ = std::move(drive_uploader);
   drive_uploader_wrapper_.reset(
       new DriveUploaderWrapper(drive_uploader_.get()));
 
   // DriveServiceWrapper and DriveServiceOnWorker relay communications
   // between DriveService and syncers in SyncWorker.
-  scoped_ptr<drive::DriveServiceInterface> drive_service_on_worker(
+  std::unique_ptr<drive::DriveServiceInterface> drive_service_on_worker(
       new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(),
                                ui_task_runner_.get(),
                                worker_task_runner_.get()));
-  scoped_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker(
+  std::unique_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker(
       new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(),
                                 ui_task_runner_.get(),
                                 worker_task_runner_.get()));
-  scoped_ptr<SyncEngineContext> sync_engine_context(new SyncEngineContext(
+  std::unique_ptr<SyncEngineContext> sync_engine_context(new SyncEngineContext(
       std::move(drive_service_on_worker), std::move(drive_uploader_on_worker),
       task_logger_, ui_task_runner_.get(), worker_task_runner_.get(),
       worker_pool_.get()));
 
   worker_observer_.reset(new WorkerObserver(ui_task_runner_.get(),
                                             weak_ptr_factory_.GetWeakPtr()));
 
   base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr;
   if (extension_service_)
     extension_service_weak_ptr = extension_service_->AsWeakPtr();
@@ skipping 169 matching lines @@
 RemoteServiceState SyncEngine::GetCurrentState() const {
   if (!sync_enabled_)
     return REMOTE_SERVICE_DISABLED;
   if (!has_refresh_token_)
     return REMOTE_SERVICE_AUTHENTICATION_REQUIRED;
   return service_state_;
 }
 
 void SyncEngine::GetOriginStatusMap(const StatusMapCallback& callback) {
   base::Closure abort_closure =
-      base::Bind(callback, base::Passed(scoped_ptr<OriginStatusMap>()));
+      base::Bind(callback, base::Passed(std::unique_ptr<OriginStatusMap>()));
 
   if (!sync_worker_) {
     abort_closure.Run();
     return;
   }
 
   StatusMapCallback tracked_callback =
       callback_tracker_.Register(abort_closure, callback);
   StatusMapCallback relayed_callback =
       RelayCallbackToCurrentThread(FROM_HERE, tracked_callback);
 
   worker_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&SyncWorkerInterface::GetOriginStatusMap,
                  base::Unretained(sync_worker_.get()),
                  relayed_callback));
 }
 
 void SyncEngine::DumpFiles(const GURL& origin,
                            const ListCallback& callback) {
   base::Closure abort_closure =
-      base::Bind(callback, base::Passed(scoped_ptr<base::ListValue>()));
+      base::Bind(callback, base::Passed(std::unique_ptr<base::ListValue>()));
 
   if (!sync_worker_) {
     abort_closure.Run();
     return;
   }
 
   ListCallback tracked_callback =
       callback_tracker_.Register(abort_closure, callback);
 
   PostTaskAndReplyWithResult(worker_task_runner_.get(),
                              FROM_HERE,
                              base::Bind(&SyncWorkerInterface::DumpFiles,
                                         base::Unretained(sync_worker_.get()),
                                         origin),
                              tracked_callback);
 }
 
 void SyncEngine::DumpDatabase(const ListCallback& callback) {
   base::Closure abort_closure =
-      base::Bind(callback, base::Passed(scoped_ptr<base::ListValue>()));
+      base::Bind(callback, base::Passed(std::unique_ptr<base::ListValue>()));
 
   if (!sync_worker_) {
     abort_closure.Run();
     return;
   }
 
   ListCallback tracked_callback =
       callback_tracker_.Register(abort_closure, callback);
 
   PostTaskAndReplyWithResult(worker_task_runner_.get(),
@@ skipping 168 matching lines @@
     const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& drive_task_runner,
     const scoped_refptr<base::SequencedWorkerPool>& worker_pool,
     const base::FilePath& sync_file_system_dir,
     TaskLogger* task_logger,
     drive::DriveNotificationManager* notification_manager,
     ExtensionServiceInterface* extension_service,
     SigninManagerBase* signin_manager,
     OAuth2TokenService* token_service,
     net::URLRequestContextGetter* request_context,
-    scoped_ptr<DriveServiceFactory> drive_service_factory,
+    std::unique_ptr<DriveServiceFactory> drive_service_factory,
     leveldb::Env* env_override)
     : ui_task_runner_(ui_task_runner),
       worker_task_runner_(worker_task_runner),
       drive_task_runner_(drive_task_runner),
       worker_pool_(worker_pool),
       sync_file_system_dir_(sync_file_system_dir),
       task_logger_(task_logger),
       notification_manager_(notification_manager),
       extension_service_(extension_service),
       signin_manager_(signin_manager),
@@ skipping 44 matching lines @@
 
 SyncStatusCallback SyncEngine::TrackCallback(
     const SyncStatusCallback& callback) {
   return callback_tracker_.Register(
       base::Bind(callback, SYNC_STATUS_ABORT),
       callback);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system