FileWrapper[Impl] modifications and actually remove the "Impl" class.

webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 51 matching lines @@
     }
     return true;
   }
 
   void VerifyIvfHeader(FileWrapper* file,
                        const uint8_t fourcc[4],
                        int width,
                        int height,
                        uint32_t num_frames,
                        bool use_capture_tims_ms) {
+    ASSERT_TRUE(file->is_open());
     uint8_t data[kHeaderSize];
     ASSERT_EQ(kHeaderSize, file->Read(data, kHeaderSize));
 
     uint8_t dkif[4] = {'D', 'K', 'I', 'F'};
     EXPECT_EQ(0, memcmp(dkif, data, 4));
     EXPECT_EQ(0u, ByteReader<uint16_t>::ReadLittleEndian(&data[4]));
     EXPECT_EQ(32u, ByteReader<uint16_t>::ReadLittleEndian(&data[6]));
     EXPECT_EQ(0, memcmp(fourcc, &data[8], 4));
     EXPECT_EQ(width, ByteReader<uint16_t>::ReadLittleEndian(&data[12]));
     EXPECT_EQ(height, ByteReader<uint16_t>::ReadLittleEndian(&data[14]));
@@ skipping 29 matching lines @@
     file_writer_ = IvfFileWriter::Open(file_name_, codec_type);
     ASSERT_TRUE(file_writer_.get());
     const int kWidth = 320;
     const int kHeight = 240;
     const int kNumFrames = 257;
     EXPECT_TRUE(
         WriteDummyTestFrames(kWidth, kHeight, kNumFrames, use_capture_tims_ms));
     EXPECT_TRUE(file_writer_->Close());
 
     std::unique_ptr<FileWrapper> out_file(FileWrapper::Create());
-    ASSERT_EQ(0, out_file->OpenFile(file_name_.c_str(), true));
+    ASSERT_TRUE(out_file->OpenFile(file_name_.c_str(), true));
     VerifyIvfHeader(out_file.get(), fourcc, kWidth, kHeight, kNumFrames,
                     use_capture_tims_ms);
     VerifyDummyTestFrames(out_file.get(), kNumFrames);
 
-    out_file->Flush();
-    EXPECT_EQ(0, out_file->CloseFile());
+    out_file->CloseFile();
 
     bool file_removed = false;
     for (int i = 0; i < kMaxFileRetries; ++i) {
       file_removed = remove(file_name_.c_str()) == 0;
       if (file_removed)
         break;
 
       // Couldn't remove file for some reason, wait a sec and try again.
       rtc::Thread::SleepMs(1000);
     }
     EXPECT_TRUE(file_removed);
   }
 
   // Check whether file exists or not, and if it does not meet expectation,
   // wait a bit and check again, up to kMaxFileRetries times. This is an ugly
   // hack to avoid flakiness on certain operating systems where antivirus
   // software may unexpectedly lock files and keep them from disappearing or
   // being reused.
   bool FileExists(bool expected) {
     bool file_exists = expected;
     std::unique_ptr<FileWrapper> file_wrapper;
     int iterations = 0;
     do {
       if (file_wrapper.get() != nullptr)
         rtc::Thread::SleepMs(1000);
       file_wrapper.reset(FileWrapper::Create());
-      file_exists = file_wrapper->OpenFile(file_name_.c_str(), true) == 0;
+      file_exists = file_wrapper->OpenFile(file_name_.c_str(), true);
       file_wrapper->CloseFile();
     } while (file_exists != expected && ++iterations < kMaxFileRetries);
     return file_exists;
   }
 
   std::string file_name_;
   std::unique_ptr<IvfFileWriter> file_writer_;
 };
 
 TEST_F(IvfFileWriterTest, RemovesUnusedFile) {
@@ skipping 29 matching lines @@
   const uint8_t fourcc[4] = {'H', '2', '6', '4'};
   RunBasicFileStructureTest(kVideoCodecH264, fourcc, false);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicH264FileMsTimestamp) {
   const uint8_t fourcc[4] = {'H', '2', '6', '4'};
   RunBasicFileStructureTest(kVideoCodecH264, fourcc, true);
 }
 
 }  // namespace webrtc