commit dca1e09db7822ab2f0221bf63c0e7151428b7b7f
author Henrik Kjellander <kjellander@webrtc.org> Sat Jul 01 16:42:22 2017 +0200
committer Henrik Kjellander <kjellander@webrtc.org> Sat Jul 01 14:42:25 2017 +0000
tree 41bc565430a649d2b757a723616b9968730754b7
parent c8fa692ec44fd6ba4fa3d085ac3161a262fc18c5

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

This reverts commit c8fa692ec44fd6ba4fa3d085ac3161a262fc18c5.

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2964773002 .
Cr-Commit-Position: refs/heads/master@{#18872}

webrtc/modules/audio_coding/acm2/codec_manager.h

diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.h b/webrtc/modules/audio_coding/acm2/codec_manager.h
index 3d45b33..b60b7e7 100644
--- a/webrtc/modules/audio_coding/acm2/codec_manager.h
+++ b/webrtc/modules/audio_coding/acm2/codec_manager.h
@@ -13,13 +13,13 @@
 
 #include <map>
 
-#include "webrtc/common_types.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {