Merge "base: Add TemporaryFile::DoNotRemove()."

base/include/android-base/test_utils.h

@@ -31,6 +31,8 @@ class TemporaryFile {
   // Release the ownership of fd, caller is reponsible for closing the
   // fd or stream properly.
   int release();
+  // Don't remove the temporary file in the destructor.
+  void DoNotRemove() { remove_file_ = false; }
 
   int fd;
   char path[1024];
@@ -38,6 +40,8 @@ class TemporaryFile {
  private:
   void init(const std::string& tmp_dir);
 
+  bool remove_file_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(TemporaryFile);
 };
 

base/test_utils.cpp

@@ -92,7 +92,9 @@ TemporaryFile::~TemporaryFile() {
   if (fd != -1) {
     close(fd);
   }
-  unlink(path);
+  if (remove_file_) {
+    unlink(path);
+  }
 }
 
 int TemporaryFile::release() {