Cleanup/Modernize code in components/drive/
Some cleanup work for components/drive/ briging it in line
with recomended practices/c++ modernization.
- clang tidy modernize-make-unique.
- Fix up headers.
This CL introduces NO logic changes.
Bug: 841659
Change-Id: I9b8e1dfbacee96c4411abd304c8faf0feb24e118
Reviewed-on: https://chromium-review.googlesource.com/1093334
Commit-Queue: Stuart Langley <[email protected]>
Reviewed-by: Noel Gordon <[email protected]>
Cr-Commit-Position: refs/heads/master@{#566728}diff --git a/components/drive/sync_client_unittest.cc b/components/drive/sync_client_unittest.cc
index c3841a3..050f1471 100644
--- a/components/drive/sync_client_unittest.cc
+++ b/components/drive/sync_client_unittest.cc
@@ -110,19 +110,19 @@
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- pref_service_.reset(new TestingPrefServiceSimple);
+ pref_service_ = std::make_unique<TestingPrefServiceSimple>();
test_util::RegisterDrivePrefs(pref_service_->registry());
- fake_network_change_notifier_.reset(
- new test_util::FakeNetworkChangeNotifier);
+ fake_network_change_notifier_ =
+ std::make_unique<test_util::FakeNetworkChangeNotifier>();
- logger_.reset(new EventLogger);
+ logger_ = std::make_unique<EventLogger>();
- drive_service_.reset(new SyncClientTestDriveService);
+ drive_service_ = std::make_unique<SyncClientTestDriveService>();
- scheduler_.reset(new JobScheduler(
+ scheduler_ = std::make_unique<JobScheduler>(
pref_service_.get(), logger_.get(), drive_service_.get(),
- base::ThreadTaskRunnerHandle::Get().get(), nullptr));
+ base::ThreadTaskRunnerHandle::Get().get(), nullptr);
metadata_storage_.reset(new ResourceMetadataStorage(
temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get()));
@@ -138,24 +138,25 @@
base::ThreadTaskRunnerHandle::Get()));
ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
- about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
+ about_resource_loader_ =
+ std::make_unique<AboutResourceLoader>(scheduler_.get());
root_folder_id_loader_ = std::make_unique<AboutResourceRootFolderIdLoader>(
about_resource_loader_.get());
- start_page_token_loader_.reset(new StartPageTokenLoader(
- drive::util::kTeamDriveIdDefaultCorpus, scheduler_.get()));
- loader_controller_.reset(new LoaderController);
- change_list_loader_.reset(new ChangeListLoader(
+ start_page_token_loader_ = std::make_unique<StartPageTokenLoader>(
+ drive::util::kTeamDriveIdDefaultCorpus, scheduler_.get());
+ loader_controller_ = std::make_unique<LoaderController>();
+ change_list_loader_ = std::make_unique<ChangeListLoader>(
logger_.get(), base::ThreadTaskRunnerHandle::Get().get(),
metadata_.get(), scheduler_.get(), root_folder_id_loader_.get(),
start_page_token_loader_.get(), loader_controller_.get(),
- util::kTeamDriveIdDefaultCorpus, util::GetDriveMyDriveRootPath()));
+ util::kTeamDriveIdDefaultCorpus, util::GetDriveMyDriveRootPath());
ASSERT_NO_FATAL_FAILURE(SetUpTestData());
- sync_client_.reset(
- new SyncClient(base::ThreadTaskRunnerHandle::Get().get(), &delegate_,
- scheduler_.get(), metadata_.get(), cache_.get(),
- loader_controller_.get(), temp_dir_.GetPath()));
+ sync_client_ = std::make_unique<SyncClient>(
+ base::ThreadTaskRunnerHandle::Get().get(), &delegate_, scheduler_.get(),
+ metadata_.get(), cache_.get(), loader_controller_.get(),
+ temp_dir_.GetPath());
// Disable delaying so that DoSyncLoop() starts immediately.
sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));
