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

webrtc/modules/bitrate_controller/bitrate_controller_impl.h

 /*
  *  Copyright (c) 2012 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.
  *
  *  Usage: this class will register multiple RtcpBitrateObserver's one at each
  *  RTCP module. It will aggregate the results and run one bandwidth estimation
  *  and push the result to the encoder via VideoEncoderCallback.
  */
 
 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
 #define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
 
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 
 #include <list>
 #include <map>
 #include <utility>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 
 class BitrateControllerImpl : public BitrateController {
  public:
   // TODO(perkj): BitrateObserver has been deprecated and is not used in WebRTC.
   // |observer| is left for project that is not yet updated.
   BitrateControllerImpl(const Clock* clock,
                         BitrateObserver* observer,
                         RtcEventLog* event_log);
@@ skipping 61 matching lines @@
 
   uint32_t last_bitrate_bps_ GUARDED_BY(critsect_);
   uint8_t last_fraction_loss_ GUARDED_BY(critsect_);
   int64_t last_rtt_ms_ GUARDED_BY(critsect_);
   uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_