--- a/chrome/common/safe_browsing/binary_feature_extractor.cc
+++ b/chrome/common/safe_browsing/binary_feature_extractor.cc
@@ -4,6 +4,8 @@

 #include "chrome/common/safe_browsing/binary_feature_extractor.h"

+#include "build/build_config.h"
+
 #include <memory>
 #include <utility>

@@ -28,21 +30,37 @@
     ExtractHeadersOption options,
     ClientDownloadRequest_ImageHeaders* image_headers,
     google::protobuf::RepeatedPtrField<std::string>* signed_data) {
+  base::FilePath temp_dir;
+  if (!base::GetTempDir(&temp_dir)) {
+    return false;
+  }
+
   base::FilePath temp_path;
-  if (!base::CreateTemporaryFile(&temp_path)) {
+  base::File temp_file = base::CreateAndOpenTemporaryFileInDir(
+      temp_dir, &temp_path, base::File::FLAG_WIN_TEMPORARY);
+  if (!temp_file.IsValid()) {
     return false;
   }

-  if (!base::CopyFile(file_path, temp_path)) {
-    base::DeleteFile(temp_path);
+#if BUILDFLAG(IS_WIN)
+  temp_file.DeleteOnClose(true);
+#else
+  base::DeleteFile(temp_path);
+#endif
+
+  base::File source_file(file_path,
+                         base::File::FLAG_OPEN | base::File::FLAG_READ);
+  if (!source_file.IsValid()) {
+    return false;
+  }
+
+  if (!base::CopyFileContents(source_file, temp_file)) {
     return false;
   }

-  base::File temp_file;
-  temp_file.Initialize(temp_path, base::File::FLAG_OPEN |
-                                      base::File::FLAG_READ |
-                                      base::File::FLAG_WIN_TEMPORARY |
-                                      base::File::FLAG_DELETE_ON_CLOSE);
+  if (temp_file.Seek(base::File::FROM_BEGIN, 0) != 0) {
+    return false;
+  }

   base::MemoryMappedFile mapped_file;
   if (!mapped_file.Initialize(std::move(temp_file))) {
--- a/chrome/common/safe_browsing/binary_feature_extractor_unittest.cc
+++ b/chrome/common/safe_browsing/binary_feature_extractor_unittest.cc
@@ -154,5 +154,28 @@
   mock_extractor->ExtractImageFeatures(
       path_, BinaryFeatureExtractor::kDefaultOptions, &image_headers, nullptr);
 }
+
+TEST_F(BinaryFeatureExtractorTest, ExtractImageFeaturesContentMatch) {
+  constexpr char kTestData[] = "Safe copy of interesting binary content";
+  WriteFileToHash(base::as_byte_span(std::string_view(kTestData)));
+
+  scoped_refptr<MockBinaryFeatureExtractor> mock_extractor(
+      new MockBinaryFeatureExtractor());
+  EXPECT_CALL(*mock_extractor, ExtractImageFeaturesFromData(_, _, _, _))
+      .WillOnce(
+          [&](base::span<const uint8_t> data,
+              BinaryFeatureExtractor::ExtractHeadersOption options,
+              ClientDownloadRequest_ImageHeaders* image_headers,
+              google::protobuf::RepeatedPtrField<std::string>* signed_data) {
+            EXPECT_EQ(std::string_view(kTestData),
+                      std::string_view(reinterpret_cast<const char*>(data.data()),
+                                       data.size()));
+            return true;
+          });
+
+  ClientDownloadRequest_ImageHeaders image_headers;
+  EXPECT_TRUE(mock_extractor->ExtractImageFeatures(
+      path_, BinaryFeatureExtractor::kDefaultOptions, &image_headers, nullptr));
+}

 }  // namespace safe_browsing
--- a/chrome/services/file_util/public/cpp/temporary_file_getter.cc
+++ b/chrome/services/file_util/public/cpp/temporary_file_getter.cc
@@ -4,6 +4,8 @@

 #include "chrome/services/file_util/public/cpp/temporary_file_getter.h"

+#include "build/build_config.h"
+
 #include "base/files/file_util.h"
 #include "base/task/thread_pool.h"

@@ -12,17 +14,28 @@
 constexpr int kMaxNumberOfFilesAllowed = 10;

 base::File TemporaryFileGetterHelper(int num_files_requested) {
+  if (num_files_requested > kMaxNumberOfFilesAllowed) {
+    return base::File();
+  }
+
+  base::FilePath temp_dir;
+  if (!base::GetTempDir(&temp_dir)) {
+    return base::File();
+  }
+
   base::FilePath temp_path;
-  base::File temp_file;
-  if (num_files_requested <= kMaxNumberOfFilesAllowed &&
-      base::CreateTemporaryFile(&temp_path)) {
-    temp_file.Initialize(
-        temp_path, (base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ |
-                    base::File::FLAG_WRITE | base::File::FLAG_WIN_TEMPORARY |
-                    base::File::FLAG_DELETE_ON_CLOSE));
-  } else {
-    temp_file = base::File();
+  base::File temp_file = base::CreateAndOpenTemporaryFileInDir(
+      temp_dir, &temp_path, base::File::FLAG_WIN_TEMPORARY);
+  if (!temp_file.IsValid()) {
+    return base::File();
   }
+
+#if BUILDFLAG(IS_WIN)
+  temp_file.DeleteOnClose(true);
+#else
+  base::DeleteFile(temp_path);
+#endif
+
   return temp_file;
 }
 }  // namespace