Clean up callers of old Env:: APIs that don't pass unique_ptr.

Change: 125386366

1 files changed, 6 insertions, 9 deletions

diff --git a/tensorflow/core/lib/io/record_reader_writer_test.cc b/tensorflow/core/lib/io/record_reader_writer_test.cc
index ee8a7fa91a..a44c35d7fd 100644
--- a/tensorflow/core/lib/io/record_reader_writer_test.cc
+++ b/tensorflow/core/lib/io/record_reader_writer_test.cc
@@ -38,26 +38,25 @@ TEST(RecordReaderWriterTest, TestBasics) {
   string fname = testing::TmpDir() + "/record_reader_writer_test";
 
   for (auto buf_size : BufferSizes()) {
-    WritableFile* file;
-    TF_CHECK_OK(env->NewWritableFile(fname, &file));
-
     {
+      std::unique_ptr<WritableFile> file;
+      TF_CHECK_OK(env->NewWritableFile(fname, &file));
+
       io::RecordWriterOptions options;
       options.zlib_options.output_buffer_size = buf_size;
-      io::RecordWriter writer(file, options);
+      io::RecordWriter writer(file.get(), options);
       writer.WriteRecord("abc");
       writer.WriteRecord("defg");
       TF_CHECK_OK(writer.Flush());
     }
-    delete file;
 
-    RandomAccessFile* read_file;
     {
+      std::unique_ptr<RandomAccessFile> read_file;
       // Read it back with the RecordReader.
       TF_CHECK_OK(env->NewRandomAccessFile(fname, &read_file));
       io::RecordReaderOptions options;
       options.zlib_options.input_buffer_size = buf_size;
-      io::RecordReader reader(read_file, options);
+      io::RecordReader reader(read_file.get(), options);
       uint64 offset = 0;
       string record;
       TF_CHECK_OK(reader.ReadRecord(&offset, &record));
@@ -65,8 +64,6 @@ TEST(RecordReaderWriterTest, TestBasics) {
       TF_CHECK_OK(reader.ReadRecord(&offset, &record));
       EXPECT_EQ("defg", record);
     }
-
-    delete read_file;
   }
 }