Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"

webrtc/call/rtp_rtcp_demuxer_helper.h

 /*
  *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_
 #define WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/optional.h"
 
 namespace webrtc {
 
 template <typename Container>
 bool MultimapAssociationExists(const Container& multimap,
                                const typename Container::key_type& key,
                                const typename Container::mapped_type& val) {
   auto it_range = multimap.equal_range(key);
   using Reference = typename Container::const_reference;
   return std::any_of(it_range.first, it_range.second,
@@ skipping 27 matching lines @@
   };
   return std::any_of(c.cbegin(), c.cend(), predicate);
 }
 
 rtc::Optional<uint32_t> ParseRtcpPacketSenderSsrc(
     rtc::ArrayView<const uint8_t> packet);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_