Rename conflicting `ReadAndDeleteFile()` functions

They conflict in jumbo/unity builds.

Since one read a file as binary data (into a `std::vector<uint8_t>`) and
one as text (into a `std::string`), it seems reasonable to change the
names to `ReadAndDeleteBinaryFile()` and `ReadAndDeleteTextFile()`.

Change-Id: I8d8402c64cfe45132df9640bd5664df28742d6d7
Reviewed-on: https://chromium-review.googlesource.com/897603Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Jens Widell <jl@opera.com>
Cr-Commit-Position: refs/heads/master@{#534007}

extensions/browser/image_sanitizer.cc

@@ -22,7 +22,7 @@ const int kMaxImageCanvas = 4096 * 4096;  // 16MB
 // Reads the file in |path| and then deletes it.
 // Returns a tuple containing: the file content, whether the read was
 // successful, whether the delete was successful.
-std::tuple<std::vector<uint8_t>, bool, bool> ReadAndDeleteFile(
+std::tuple<std::vector<uint8_t>, bool, bool> ReadAndDeleteBinaryFile(
     const base::FilePath& path) {
   std::vector<uint8_t> contents;
   bool read_success = false;
@@ -120,7 +120,7 @@ void ImageSanitizer::Start(service_manager::Connector* connector,
     base::FilePath full_image_path = image_dir_.Append(path);
     base::PostTaskAndReplyWithResult(
         extensions::GetExtensionFileTaskRunner().get(), FROM_HERE,
-        base::BindOnce(&ReadAndDeleteFile, full_image_path),
+        base::BindOnce(&ReadAndDeleteBinaryFile, full_image_path),
         base::BindOnce(&ImageSanitizer::ImageFileRead,
                        weak_factory_.GetWeakPtr(), path));
   }
@@ -221,4 +221,4 @@ void ImageSanitizer::CleanUp() {
   image_decoded_callback_.Reset();
 }
 
-}  // namespace extensions
+}  // namespace extensions
\ No newline at end of file

extensions/browser/json_file_sanitizer.cc

@@ -17,7 +17,7 @@ namespace {
 // Reads the file in |path| and then deletes it.
 // Returns a tuple containing: the file content, whether the read was
 // successful, whether the delete was successful.
-std::tuple<std::string, bool, bool> ReadAndDeleteFile(
+std::tuple<std::string, bool, bool> ReadAndDeleteTextFile(
     const base::FilePath& path) {
   std::string contents;
   bool read_success = base::ReadFileToString(path, &contents);
@@ -69,7 +69,7 @@ void JsonFileSanitizer::Start(service_manager::Connector* connector,
   for (const base::FilePath& path : file_paths_) {
     base::PostTaskAndReplyWithResult(
         extensions::GetExtensionFileTaskRunner().get(), FROM_HERE,
-        base::BindOnce(&ReadAndDeleteFile, path),
+        base::BindOnce(&ReadAndDeleteTextFile, path),
         base::BindOnce(&JsonFileSanitizer::JsonFileRead,
                        weak_factory_.GetWeakPtr(), path));
   }
@@ -145,4 +145,4 @@ void JsonFileSanitizer::ReportError(Status status, const std::string& error) {
   std::move(callback_).Run(status, error);
 }
 
-}  // namespace extensions
+}  // namespace extensions
\ No newline at end of file