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

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 110 matching lines @@
 // Define |x_label| and |y_label| for plots.
 #define BWE_TEST_LOGGING_LABEL(figure, x_label, y_label, num_flows)
 
 #else  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 
 #include <map>
 #include <memory>
 #include <stack>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
 
 #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
     do { \
       webrtc::testing::bwe::Logging::GetInstance()->SetGlobalContext(name); \
     } while (0)
 
 #define BWE_TEST_LOGGING_GLOBAL_ENABLE(enabled) \
     do { \
       webrtc::testing::bwe::Logging::GetInstance()->SetGlobalEnable(enabled); \
     } while (0)
@@ skipping 198 matching lines @@
   ThreadMap thread_map_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Logging);
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_