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

webrtc/common_video/include/video_frame_buffer.h

 /*
  *  Copyright (c) 2015 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_INCLUDE_VIDEO_FRAME_BUFFER_H_
 #define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_
 
 #include <memory>
 
 #include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/rtc_base/callback.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/callback.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
 // Deprecated. Please use WrapI420Buffer(...) instead.
 class WrappedI420Buffer : public I420BufferInterface {
  public:
   WrappedI420Buffer(int width,
                     int height,
                     const uint8_t* y_plane,
                     int y_stride,
@@ skipping 57 matching lines @@
     int y_stride,
     const uint8_t* u_plane,
     int u_stride,
     const uint8_t* v_plane,
     int v_stride,
     const rtc::Callback0<void>& no_longer_used);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_