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

webrtc/common_video/h264/sps_vui_rewriter.h

 /*
  *  Copyright (c) 2016 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_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
 #define WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
 
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/common_video/h264/sps_parser.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 class BitBuffer;
 }
 
 namespace webrtc {
 
 // A class that can parse an SPS block of a NAL unit and if necessary
 // creates a copy with updated settings to allow for faster decoding for streams
 // that use picture order count type 0. Streams in that format incur additional
@@ skipping 17 matching lines @@
   // decoding has been performed.
   static ParseResult ParseAndRewriteSps(const uint8_t* buffer,
                                         size_t length,
                                         rtc::Optional<SpsParser::SpsState>* sps,
                                         rtc::Buffer* destination);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_