From fda065fcec0c94391561788da4b05ef305de74e6 Mon Sep 17 00:00:00 2001 From: Stuart Langley Date: Wed, 30 May 2018 03:01:05 +0000 Subject: [PATCH] clang-tidy modernize-(use-nullptr|raw-string-literal) components/drive/*. Continue modernization of the drive code, using clang-tidy. This change replaces NULL with nullptr and strings like "embedded \"quotes\"" with R"(embedded "quotes")". Steps: $ autoninja -C out/Default chrome $ tools/clang/scripts/generate_compdb.py -p \ out/Default > compile_commands.json $ cd out/Default/ $ /usr/local/google/code/llvm/tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \ -p ../.. \ -clang-tidy-binary /usr/local/google/code/build/bin/clang-tidy \ -clang-apply-replacements-binary /usr/local/google/code/build/bin/clang-apply-replacements \ -checks=-*,modernize-use-nullptr,modernize-raw-string-literal \ -header-filter= \ -fix components/drive No logic changes. No new tests. Bug: 841659 Change-Id: I0ff0f09d3089aa4c72da7d39ef9698140f4a26aa Reviewed-on: https://chromium-review.googlesource.com/1077107 Commit-Queue: Noel Gordon Reviewed-by: Noel Gordon Cr-Commit-Position: refs/heads/master@{#562710} --- components/drive/about_resource_loader_unittest.cc | 2 +- components/drive/change_list_loader_unittest.cc | 2 +- components/drive/directory_loader_unittest.cc | 2 +- components/drive/file_system_core_util.cc | 2 +- components/drive/file_system_core_util_unittest.cc | 4 ++-- components/drive/search_metadata_unittest.cc | 6 ++---- components/drive/start_page_token_loader_unittest.cc | 2 +- components/drive/sync_client_unittest.cc | 2 +- components/drive/team_drive_list_loader_unittest.cc | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/components/drive/about_resource_loader_unittest.cc b/components/drive/about_resource_loader_unittest.cc index 1ad695cbc39a3c..24c23a78df2988 100644 --- a/components/drive/about_resource_loader_unittest.cc +++ b/components/drive/about_resource_loader_unittest.cc @@ -46,7 +46,7 @@ class AboutResourceLoaderTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset( diff --git a/components/drive/change_list_loader_unittest.cc b/components/drive/change_list_loader_unittest.cc index 1633acd846370b..6d258931b5bfda 100644 --- a/components/drive/change_list_loader_unittest.cc +++ b/components/drive/change_list_loader_unittest.cc @@ -103,7 +103,7 @@ class ChangeListLoaderTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset(new ResourceMetadata( diff --git a/components/drive/directory_loader_unittest.cc b/components/drive/directory_loader_unittest.cc index c51f49e2d1e38a..c36f832c6317f0 100644 --- a/components/drive/directory_loader_unittest.cc +++ b/components/drive/directory_loader_unittest.cc @@ -92,7 +92,7 @@ class DirectoryLoaderTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset(new ResourceMetadata( diff --git a/components/drive/file_system_core_util.cc b/components/drive/file_system_core_util.cc index 0332592dcb4e15..373f2008344ad0 100644 --- a/components/drive/file_system_core_util.cc +++ b/components/drive/file_system_core_util.cc @@ -150,7 +150,7 @@ bool CreateGDocFile(const base::FilePath& file_path, const GURL& url, const std::string& resource_id) { std::string content = - base::StringPrintf("{\"url\": \"%s\", \"resource_id\": \"%s\"}", + base::StringPrintf(R"({"url": "%s", "resource_id": "%s"})", url.spec().c_str(), resource_id.c_str()); return base::WriteFile(file_path, content.data(), content.size()) == static_cast(content.size()); diff --git a/components/drive/file_system_core_util_unittest.cc b/components/drive/file_system_core_util_unittest.cc index 35752cdb576de3..c5923657fcc17e 100644 --- a/components/drive/file_system_core_util_unittest.cc +++ b/components/drive/file_system_core_util_unittest.cc @@ -25,9 +25,9 @@ class FileSystemUtilTest : public testing::Test { TEST_F(FileSystemUtilTest, EscapeUnescapeCacheFileName) { const std::string kUnescapedFileName( - "tmp:`~!@#$%^&*()-_=+[{|]}\\\\;\',<.>/?"); + R"(tmp:`~!@#$%^&*()-_=+[{|]}\\;',<.>/?)"); const std::string kEscapedFileName( - "tmp:`~!@#$%25^&*()-_=+[{|]}\\\\;\',<%2E>%2F?"); + R"(tmp:`~!@#$%25^&*()-_=+[{|]}\\;',<%2E>%2F?)"); EXPECT_EQ(kEscapedFileName, EscapeCacheFileName(kUnescapedFileName)); EXPECT_EQ(kUnescapedFileName, UnescapeCacheFileName(kEscapedFileName)); } diff --git a/components/drive/search_metadata_unittest.cc b/components/drive/search_metadata_unittest.cc index 89bc5a0a4475c2..0c7985fbc18192 100644 --- a/components/drive/search_metadata_unittest.cc +++ b/components/drive/search_metadata_unittest.cc @@ -480,10 +480,8 @@ TEST_F(SearchMetadataTest, // \xE3\x80\x80 is ideographic space. SearchMetadata( base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), - "Directory\xE3\x80\x80" - "1", - base::Bind(&MatchesType, SEARCH_METADATA_ALL), kDefaultAtMostNumMatches, - MetadataSearchOrder::LAST_ACCESSED, + R"(Directory　1)", base::Bind(&MatchesType, SEARCH_METADATA_ALL), + kDefaultAtMostNumMatches, MetadataSearchOrder::LAST_ACCESSED, google_apis::test_util::CreateCopyResultCallback(&error, &result)); base::RunLoop().RunUntilIdle(); diff --git a/components/drive/start_page_token_loader_unittest.cc b/components/drive/start_page_token_loader_unittest.cc index f7dfab118883f3..8972a68f4ab291 100644 --- a/components/drive/start_page_token_loader_unittest.cc +++ b/components/drive/start_page_token_loader_unittest.cc @@ -46,7 +46,7 @@ class StartPageTokenLoaderTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset( diff --git a/components/drive/sync_client_unittest.cc b/components/drive/sync_client_unittest.cc index ec6bec85f6e382..c3841a3a6e2115 100644 --- a/components/drive/sync_client_unittest.cc +++ b/components/drive/sync_client_unittest.cc @@ -130,7 +130,7 @@ class SyncClientTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset(new internal::ResourceMetadata( diff --git a/components/drive/team_drive_list_loader_unittest.cc b/components/drive/team_drive_list_loader_unittest.cc index 738a9cd9b1f1ec..f26e94eabdf8fd 100644 --- a/components/drive/team_drive_list_loader_unittest.cc +++ b/components/drive/team_drive_list_loader_unittest.cc @@ -53,7 +53,7 @@ class TeamDriveListLoaderTest : public testing::Test { cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(), - NULL /* free_disk_space_getter */)); + nullptr /* free_disk_space_getter */)); ASSERT_TRUE(cache_->Initialize()); metadata_.reset(