Remove PRIsFP macro in base/file_path.h

This CL means removing duplicate macro in base/file_path.h.
PRIsFP is replaced with PRFilePath.

Bug: 882796
Change-Id: I69f1dc3c13921d0f5d8f1f2de577f27f8db072f4
Reviewed-on: https://chromium-review.googlesource.com/1220406
Commit-Queue: Jaeyong Bae <jdragon.bae@gmail.com>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595301}

base/files/file_path.h

@@ -124,13 +124,20 @@
 #define FILE_PATH_USES_WIN_SEPARATORS
 #endif  // OS_WIN
 
-// To print path names portably use PRIsFP (based on PRIuS and friends from
+// To print path names portably use PRFilePath (based on PRIuS and friends from
 // C99 and format_macros.h) like this:
-// base::StringPrintf("Path is %" PRIsFP ".\n", path.value().c_str());
+// base::StringPrintf("Path is %" PRFilePath ".\n", path.value().c_str());
 #if defined(OS_WIN)
-#define PRIsFP "ls"
+#define PRFilePath "ls"
 #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
-#define PRIsFP "s"
+#define PRFilePath "s"
+#endif  // OS_WIN
+
+// Macros for string literal initialization of FilePath::CharType[].
+#if defined(OS_WIN)
+#define FILE_PATH_LITERAL(x) L##x
+#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#define FILE_PATH_LITERAL(x) x
 #endif  // OS_WIN
 
 namespace base {
@@ -455,16 +462,6 @@ BASE_EXPORT std::ostream& operator<<(std::ostream& out,
 
 }  // namespace base
 
-// Macros for string literal initialization of FilePath::CharType[], and for
-// using a FilePath::CharType[] in a printf-style format string.
-#if defined(OS_WIN)
-#define FILE_PATH_LITERAL(x) L ## x
-#define PRFilePath "ls"
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
-#define FILE_PATH_LITERAL(x) x
-#define PRFilePath "s"
-#endif  // OS_WIN
-
 namespace std {
 
 template <>

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

@@ -152,7 +152,7 @@ void LocalToRemoteSyncer::RunPreflight(std::unique_ptr<SyncTaskToken> token) {
     if (!active_ancestor_path.AppendRelativePath(path, &missing_entries)) {
       NOTREACHED();
       token->RecordLog(
-          base::StringPrintf("Detected invalid ancestor: %" PRIsFP,
+          base::StringPrintf("Detected invalid ancestor: %" PRFilePath,
                              active_ancestor_path.value().c_str()));
       SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_FAILED);
       return;

chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc

@@ -45,13 +45,14 @@ policy::Schema StorageSchemaManifestHandler::GetSchema(
   }
   file = extension->path().AppendASCII(path);
   if (!base::PathExists(file)) {
-    *error = base::StringPrintf("File does not exist: %" PRIsFP,
+    *error = base::StringPrintf("File does not exist: %" PRFilePath,
                                 file.value().c_str());
     return policy::Schema();
   }
   std::string content;
   if (!base::ReadFileToString(file, &content)) {
-    *error = base::StringPrintf("Can't read %" PRIsFP, file.value().c_str());
+    *error =
+        base::StringPrintf("Can't read %" PRFilePath, file.value().c_str());
     return policy::Schema();
   }
   return policy::Schema::Parse(content, error);

chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc

@@ -90,7 +90,7 @@ void SandboxedRarAnalyzer::ReportFileFailure() {
 }
 
 std::string SandboxedRarAnalyzer::DebugString() const {
-  return base::StringPrintf("path: %" PRIsFP "; analyzer_ptr_: %p",
+  return base::StringPrintf("path: %" PRFilePath "; analyzer_ptr_: %p",
                             file_path_.value().c_str(), analyzer_ptr_.get());
 }
 

chrome/test/chromedriver/element_commands.cc

@@ -355,7 +355,7 @@ Status ExecuteSendKeysToElement(Session* session,
       if (is_desktop && !base::PathExists(base::FilePath(path_piece))) {
         return Status(
             kInvalidArgument,
-            base::StringPrintf("File not found : %" PRIsFP,
+            base::StringPrintf("File not found : %" PRFilePath,
                                base::FilePath(path_piece).value().c_str()));
       }
       paths.push_back(base::FilePath(path_piece));

components/policy/core/common/preg_parser.cc

@@ -314,7 +314,7 @@ bool ReadFile(const base::FilePath& file_path,
 
   return ReadDataInternal(
       mapped_file.data(), mapped_file.length(), root, dict, status,
-      base::StringPrintf("file '%" PRIsFP "'", file_path.value().c_str()));
+      base::StringPrintf("file '%" PRFilePath "'", file_path.value().c_str()));
 }
 
 POLICY_EXPORT bool ReadDataInternal(const uint8_t* preg_data,

components/reading_list/core/offline_url_utils_unittest.cc

@@ -18,8 +18,8 @@ TEST(OfflineURLUtilsTest, OfflineRootDirectoryPathTest) {
   base::FilePath offline_directory =
       reading_list::OfflineRootDirectoryPath(profile_path);
   // Expected value: profile_path/Offline
-  std::string expected =
-      base::StringPrintf("profile_path%" PRIsFP "Offline", separator.c_str());
+  std::string expected = base::StringPrintf(
+      "profile_path%" PRFilePath "Offline", separator.c_str());
   EXPECT_EQ(expected, offline_directory.AsUTF8Unsafe());
 }
 
@@ -42,7 +42,7 @@ TEST(OfflineURLUtilsTest, OfflineURLDirectoryAbsolutePathTest) {
       reading_list::OfflineURLDirectoryAbsolutePath(profile_path, url);
   // Expected value: profile_path/Offline/0090071ef710946a1263c276284bb3b8
   std::string expected =
-      base::StringPrintf("profile_path%" PRIsFP "Offline%" PRIsFP
+      base::StringPrintf("profile_path%" PRFilePath "Offline%" PRFilePath
                          "0090071ef710946a1263c276284bb3b8",
                          separator.c_str(), separator.c_str());
   EXPECT_EQ(expected, offline_directory.AsUTF8Unsafe());
@@ -60,7 +60,8 @@ TEST(OfflineURLUtilsTest, AbsolutePathForRelativePathTest) {
                                                            relative_path);
   // Expected value: profile_path/Offline/relative/path
   std::string expected = base::StringPrintf(
-      "profile_path%" PRIsFP "Offline%" PRIsFP "relative%" PRIsFP "path",
+      "profile_path%" PRFilePath "Offline%" PRFilePath "relative%" PRFilePath
+      "path",
       separator.c_str(), separator.c_str(), separator.c_str());
   EXPECT_EQ(expected, absolute_path.AsUTF8Unsafe());
 }
@@ -72,14 +73,15 @@ TEST(OfflineURLUtilsTest, OfflinePagePathTest) {
   base::FilePath offline_page =
       reading_list::OfflinePagePath(url, reading_list::OFFLINE_TYPE_HTML);
   // Expected value: 0090071ef710946a1263c276284bb3b8/page.html
-  std::string expected_html =
-      base::StringPrintf("0090071ef710946a1263c276284bb3b8%" PRIsFP "page.html",
-                         separator.c_str());
+  std::string expected_html = base::StringPrintf(
+      "0090071ef710946a1263c276284bb3b8%" PRFilePath "page.html",
+      separator.c_str());
   EXPECT_EQ(expected_html, offline_page.AsUTF8Unsafe());
   offline_page =
       reading_list::OfflinePagePath(url, reading_list::OFFLINE_TYPE_PDF);
   // Expected value: 0090071ef710946a1263c276284bb3b8/file.pdf
   std::string expected_pdf = base::StringPrintf(
-      "0090071ef710946a1263c276284bb3b8%" PRIsFP "file.pdf", separator.c_str());
+      "0090071ef710946a1263c276284bb3b8%" PRFilePath "file.pdf",
+      separator.c_str());
   EXPECT_EQ(expected_pdf, offline_page.AsUTF8Unsafe());
 }

components/safe_browsing/db/v4_protocol_manager_util.cc

@@ -184,7 +184,7 @@ ListIdentifier GetUrlUwsId() {
 std::string GetUmaSuffixForStore(const base::FilePath& file_path) {
   DCHECK_EQ(kStoreSuffix, file_path.BaseName().Extension());
   return base::StringPrintf(
-      ".%" PRIsFP, file_path.BaseName().RemoveExtension().value().c_str());
+      ".%" PRFilePath, file_path.BaseName().RemoveExtension().value().c_str());
 }
 
 StoreAndHashPrefix::StoreAndHashPrefix(ListIdentifier list_id,

components/safe_browsing/db/v4_store.cc

@@ -208,7 +208,7 @@ std::string V4Store::DebugString() const {
   std::string state_base64;
   base::Base64Encode(state_, &state_base64);
 
-  return base::StringPrintf("path: %" PRIsFP "; state: %s",
+  return base::StringPrintf("path: %" PRFilePath "; state: %s",
                             store_path_.value().c_str(), state_base64.c_str());
 }
 

content/browser/devtools/protocol/memory_handler.cc

@@ -61,7 +61,7 @@ Response MemoryHandler::GetBrowserSamplingProfile(
   for (const auto* module : module_cache.GetModules()) {
     modules->addItem(Memory::Module::Create()
                          .SetName(base::StringPrintf(
-                             "%" PRIsFP, module->filename.value().c_str()))
+                             "%" PRFilePath, module->filename.value().c_str()))
                          .SetUuid(module->id)
                          .SetBaseAddress(base::StringPrintf(
                              "0x%" PRIxPTR, module->base_address))

storage/browser/fileapi/dump_file_system.cc

@@ -103,9 +103,9 @@ static void DumpDirectoryTree(const std::string& origin_name,
     std::vector<SandboxDirectoryDatabase::FileId> children;
     if (info.is_directory()) {
       if (!directory_db.ListChildren(id, &children)) {
-        ShowMessageAndExit(base::StringPrintf("ListChildren failed for %" PRIsFP
-                                              " (%" PRId64 ")",
-                                              info.name.c_str(), id));
+        ShowMessageAndExit(base::StringPrintf(
+            "ListChildren failed for %" PRFilePath " (%" PRId64 ")",
+            info.name.c_str(), id));
       }
 
       for (size_t j = children.size(); j; j--)