From 989ec098d13525cf948926bcf403b03baa50e051 Mon Sep 17 00:00:00 2001 From: nisse Date: Tue, 10 Jan 2017 03:44:41 -0800 Subject: [PATCH] Drop unneeded includes of base/stream.h. BUG=webrtc:6424 Review-Url: https://codereview.webrtc.org/2587423002 Cr-Commit-Position: refs/heads/master@{#15986} --- webrtc/base/base64_unittest.cc | 1 - webrtc/base/fileutils.cc | 3 +-- webrtc/common_video/h264/sps_vui_rewriter_unittest.cc | 1 - webrtc/media/engine/webrtcvoiceengine.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/webrtc/base/base64_unittest.cc b/webrtc/base/base64_unittest.cc index c4d4072449..58fc433ceb 100644 --- a/webrtc/base/base64_unittest.cc +++ b/webrtc/base/base64_unittest.cc @@ -13,7 +13,6 @@ #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" -#include "webrtc/base/stream.h" #include "webrtc/base/testbase64.h" diff --git a/webrtc/base/fileutils.cc b/webrtc/base/fileutils.cc index cb63cce7d6..a883995054 100644 --- a/webrtc/base/fileutils.cc +++ b/webrtc/base/fileutils.cc @@ -14,7 +14,6 @@ #include "webrtc/base/checks.h" #include "webrtc/base/pathutils.h" #include "webrtc/base/stringutils.h" -#include "webrtc/base/stream.h" #if defined(WEBRTC_WIN) #include "webrtc/base/win32filesystem.h" @@ -136,7 +135,7 @@ DirectoryIterator* FilesystemInterface::IterateDirectory() { bool FilesystemInterface::DeleteFolderContents(const Pathname &folder) { bool success = true; - VERIFY(IsFolder(folder)); + RTC_CHECK(IsFolder(folder)); DirectoryIterator *di = IterateDirectory(); if (!di) return false; diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc index 711a8365df..44c6287588 100644 --- a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc +++ b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc @@ -15,7 +15,6 @@ #include "webrtc/base/fileutils.h" #include "webrtc/base/logging.h" #include "webrtc/base/pathutils.h" -#include "webrtc/base/stream.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/common_video/h264/sps_vui_rewriter.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h index 224fcb20b6..6c88bbf31b 100644 --- a/webrtc/media/engine/webrtcvoiceengine.h +++ b/webrtc/media/engine/webrtcvoiceengine.h @@ -20,7 +20,6 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/networkroute.h" #include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/stream.h" #include "webrtc/base/thread_checker.h" #include "webrtc/call/audio_state.h" #include "webrtc/call/call.h"