commit ca81a3cc846e4a5e1b4d66192b884c5065e81631
author Niels Möller <nisse@webrtc.org> Mon Mar 29 08:15:14 2021
committer Commit Bot <commit-bot@chromium.org> Mon Mar 29 09:47:33 2021
tree 0075516fcdd5b1e90efd0b1336218c76defefe43
parent a9311b6761c88d5f5602f4891fdb1b612ae2a4a4

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 <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33580}

rtc_base/file_rotating_stream.h

diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h
index 5826a81..88461e3 100644
--- a/rtc_base/file_rotating_stream.h
+++ b/rtc_base/file_rotating_stream.h
@@ -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 {

rtc_base/file_rotating_stream_unittest.cc

diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc
index 4718b6f..849b111 100644
--- a/rtc_base/file_rotating_stream_unittest.cc
+++ b/rtc_base/file_rotating_stream_unittest.cc
@@ -72,7 +72,7 @@
 
   // 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 @@
   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 @@
   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};