From 6e9d89588dc36c8056bea0049137ca4783de0ec3 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Mon, 9 Apr 2018 20:30:51 +0200
Subject: [PATCH] Add missing includes checks.h/array_view.h

instead of relying on optional.h to included these 2 headers.

Bug: webrtc:9078
Change-Id: I7a4b3facd81690b8f107640487e129986c1f5ff6
Reviewed-on: https://webrtc-review.googlesource.com/68602
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22803}
---
 api/audio_codecs/audio_format.h                               | 1 +
 api/rtptransceiverinterface.h                                 | 1 +
 .../output/rtc_event_log_output_file_unittest.cc              | 4 +++-
 modules/audio_processing/aec3/matched_filter.h                | 1 +
 rtc_base/string_to_number.cc                                  | 4 +++-
 rtc_tools/network_tester/config_reader.cc                     | 2 ++
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h
index 12e9552e93..2a85c6f553 100644
--- a/api/audio_codecs/audio_format.h
+++ b/api/audio_codecs/audio_format.h
@@ -17,6 +17,7 @@
 #include <utility>
 
 #include "api/optional.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/api/rtptransceiverinterface.h b/api/rtptransceiverinterface.h
index c9a86e6c63..78055797d2 100644
--- a/api/rtptransceiverinterface.h
+++ b/api/rtptransceiverinterface.h
@@ -14,6 +14,7 @@
 #include <string>
 #include <vector>
 
+#include "api/array_view.h"
 #include "api/optional.h"
 #include "api/rtpreceiverinterface.h"
 #include "api/rtpsenderinterface.h"
diff --git a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
index a2a0204961..ee19816558 100644
--- a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
+++ b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
@@ -8,11 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
+
 #include <fstream>
 #include <memory>
 #include <string>
 
-#include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/ptr_util.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h
index c9bdc462e8..36c9cad74a 100644
--- a/modules/audio_processing/aec3/matched_filter.h
+++ b/modules/audio_processing/aec3/matched_filter.h
@@ -15,6 +15,7 @@
 #include <memory>
 #include <vector>
 
+#include "api/array_view.h"
 #include "api/optional.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/downsampled_render_buffer.h"
diff --git a/rtc_base/string_to_number.cc b/rtc_base/string_to_number.cc
index ad49d646d6..fe17f3433b 100644
--- a/rtc_base/string_to_number.cc
+++ b/rtc_base/string_to_number.cc
@@ -8,10 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/string_to_number.h"
+
 #include <cerrno>
 #include <cstdlib>
 
-#include "rtc_base/string_to_number.h"
+#include "rtc_base/checks.h"
 
 namespace rtc {
 namespace string_to_number_internal {
diff --git a/rtc_tools/network_tester/config_reader.cc b/rtc_tools/network_tester/config_reader.cc
index a0ee29355a..5ef1e4bf8b 100644
--- a/rtc_tools/network_tester/config_reader.cc
+++ b/rtc_tools/network_tester/config_reader.cc
@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+#include "rtc_base/checks.h"
+
 namespace webrtc {
 
 ConfigReader::ConfigReader(const std::string& config_file_path)