Refactor FileRotatingStream to use FileWrapper rather than FileStream
Bug: webrtc:6463
Change-Id: I77df2c77a658e9c5614554fb5ef8f2dc053031e6
Reviewed-on: https://webrtc-review.googlesource.com/c/117620
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26355}diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc
index 214cde9..22e247f 100644
--- a/rtc_base/file_rotating_stream_unittest.cc
+++ b/rtc_base/file_rotating_stream_unittest.cc
@@ -92,11 +92,9 @@
const size_t expected_length,
const std::string& file_path) {
std::unique_ptr<uint8_t[]> buffer(new uint8_t[expected_length + 1]);
- FileStream stream;
- ASSERT_TRUE(stream.Open(file_path, "r", nullptr));
- size_t size_read = 0;
- EXPECT_EQ(rtc::SR_EOS, stream.ReadAll(buffer.get(), expected_length + 1,
- &size_read, nullptr));
+ webrtc::FileWrapper f = webrtc::FileWrapper::OpenReadOnly(file_path);
+ ASSERT_TRUE(f.is_open());
+ size_t size_read = f.Read(buffer.get(), expected_length + 1);
EXPECT_EQ(size_read, expected_length);
EXPECT_EQ(0, memcmp(expected_contents, buffer.get(),
std::min(expected_length, size_read)));
@@ -129,12 +127,10 @@
WriteAndFlush("a", 0);
std::string logfile_path = stream_->GetFilePath(0);
- FileStream stream;
- ASSERT_TRUE(stream.Open(logfile_path, "r", nullptr));
+ webrtc::FileWrapper f = webrtc::FileWrapper::OpenReadOnly(logfile_path);
+ ASSERT_TRUE(f.is_open());
char buf[1];
- size_t read_nbytes;
- int read_error;
- EXPECT_EQ(SR_EOS, stream.Read(buf, sizeof(buf), &read_nbytes, &read_error));
+ EXPECT_EQ(0u, f.Read(buf, sizeof(buf)));
}
// Tests that a write operation followed by a read returns the expected data