zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete left-over include of rtc_base/stream.h from FileRotatingStream

Browse Source 
And update tests to not use SR_SUCCESS. This was overlooked in
https://webrtc-review.googlesource.com/c/src/+/212969.

Bug: webrtc:7811
Change-Id: I74cd7916311a0d40c912568c70164fe353339a62
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213143
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33580}
This commit is contained in:
Niels Möller
2021-03-29 10:15:14 +02:00
committed by Commit Bot
parent a9311b6761
commit ca81a3cc84
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtc_base/file_rotating_stream.h
View File

@ -18,7 +18,6 @@
#include <vector>
#include "rtc_base/constructor_magic.h"
#include "rtc_base/stream.h"
#include "rtc_base/system/file_wrapper.h"
namespace rtc {

6
rtc_base/file_rotating_stream_unittest.cc
View File

@ -72,7 +72,7 @@ class MAYBE_FileRotatingStreamTest : public ::testing::Test {
// Writes the data to the stream and flushes it.
void WriteAndFlush(const void* data, const size_t data_len) {
EXPECT_EQ(SR_SUCCESS, stream_->Write(data, data_len));
EXPECT_TRUE(stream_->Write(data, data_len));
EXPECT_TRUE(stream_->Flush());
}
@ -334,7 +334,7 @@ TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadLarge) {
std::unique_ptr<uint8_t[]> buffer(new uint8_t[buffer_size]);
for (int i = 0; i < 8; i++) {
memset(buffer.get(), i, buffer_size);
EXPECT_EQ(SR_SUCCESS, stream_->Write(buffer.get(), buffer_size));
EXPECT_TRUE(stream_->Write(buffer.get(), buffer_size));
}
const int expected_vals[] = {0, 1, 2, 6, 7};
@ -368,7 +368,7 @@ TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadFirstHalf) {
std::unique_ptr<uint8_t[]> buffer(new uint8_t[buffer_size]);
for (int i = 0; i < 2; i++) {
memset(buffer.get(), i, buffer_size);
EXPECT_EQ(SR_SUCCESS, stream_->Write(buffer.get(), buffer_size));
EXPECT_TRUE(stream_->Write(buffer.get(), buffer_size));
}
const int expected_vals[] = {0, 1};