| commit | 370dd479730b4918b8b81842c4c36d25d0633b50 | [log] [tgz] |
|---|---|---|
| author | ehmaldonado <ehmaldonado@webrtc.org> | Mon Jul 10 05:58:42 2017 -0700 |
| committer | Commit Bot <commit-bot@chromium.org> | Mon Jul 10 12:58:42 2017 +0000 |
| tree | 9fe152510895bee40f8520acdd78f9aab239adb9 | |
| parent | 9483b49bafc681a8360dff7217e7651a74dea71d [diff] [blame] |
Revert of Remove remains of webrtc/base (patchset #7 id:120001 of https://codereview.webrtc.org/2973183002/ ) Reason for revert: Breaks lots of downstream projects. Original issue's description: > Remove remains of webrtc/base > > All downstream code have been updated to the new location. > > In PRESUBMIT.py: > * Remove webrtc/rtc_base from CPP_BLACKLIST > * Add webrtc/rtc_base to LEGACY_API_DIRS > > Fix some duplicated paths in > webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn > > BUG=webrtc:7634 > TBR=kwiberg@webrtc.org > > Review-Url: https://codereview.webrtc.org/2973183002 > Cr-Commit-Position: refs/heads/master@{#18948} > Committed: https://chromium.googlesource.com/external/webrtc/+/9483b49bafc681a8360dff7217e7651a74dea71d TBR=kwiberg@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7634 Review-Url: https://codereview.webrtc.org/2976633002 Cr-Commit-Position: refs/heads/master@{#18949}
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm index 49cc812..ec3e226 100644 --- a/webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm +++ b/webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
@@ -12,7 +12,7 @@ #include <vector> -#include "webrtc/rtc_base/gunit.h" +#include "webrtc/base/gunit.h" #import "NSString+StdString.h" #import "WebRTC/RTCTracing.h"