Reland "Update includes for webrtc/{base => rtc_base} rename (3/3)"
I used a command like this to update the paths:
perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"`
Changes since last attempt: Some system headers were moved back to their original location since on Windows compilation breaks otherwise.
BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True
TBR=kwiberg@webrtc.org
Review-Url: https://codereview.webrtc.org/2966523003
Cr-Commit-Position: refs/heads/master@{#18868}
diff --git a/webrtc/rtc_base/cpu_time_unittest.cc b/webrtc/rtc_base/cpu_time_unittest.cc
index bfdd7ef..a9af7ba 100644
--- a/webrtc/rtc_base/cpu_time_unittest.cc
+++ b/webrtc/rtc_base/cpu_time_unittest.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <memory>
+#include "webrtc/rtc_base/cpu_time.h"
#include <algorithm>
-#include "webrtc/base/cpu_time.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/test/gtest.h"
+#include <memory>
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/cpu_info.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
// Only run these tests on non-instrumented builds, because timing on
// instrumented builds is unreliable, causing the test to be flaky.