From ca81a3cc846e4a5e1b4d66192b884c5065e81631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 29 Mar 2021 10:15:14 +0200 Subject: [PATCH] Delete left-over include of rtc_base/stream.h from FileRotatingStream 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 Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#33580} --- rtc_base/file_rotating_stream.h | 1 - rtc_base/file_rotating_stream_unittest.cc | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h index 5826a8135a..88461e344f 100644 --- a/rtc_base/file_rotating_stream.h +++ b/rtc_base/file_rotating_stream.h @@ -18,7 +18,6 @@ #include #include "rtc_base/constructor_magic.h" -#include "rtc_base/stream.h" #include "rtc_base/system/file_wrapper.h" namespace rtc { diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc index 4718b6f3e1..849b111148 100644 --- a/rtc_base/file_rotating_stream_unittest.cc +++ b/rtc_base/file_rotating_stream_unittest.cc @@ -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 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 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};