diff options
| author | mcasas@webrtc.org <mcasas@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-21 11:07:29 +0000 |
|---|---|---|
| committer | mcasas@webrtc.org <mcasas@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-21 11:07:29 +0000 |
| commit | 0a9ed7c31eab2a2c73eb0020c8b278762ad58ea5 (patch) | |
| tree | 726f2dc7d6530b3b1398b298d63a350611cd6034 /test | |
| parent | 8520b33f59f31e9e752e0ffc708bb4bf79eaa9a1 (diff) | |
| download | webrtc-0a9ed7c31eab2a2c73eb0020c8b278762ad58ea5.tar.gz | |
Revert 6202 "Switch to using base/constructormagic.h and remove ..."
> Switch to using base/constructormagic.h and remove system_wrappers/interface/constructor_magic.h.
>
> BUG=N/A
> R=andrew@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/19519004
TBR=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14579007
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6210 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'test')
| -rw-r--r-- | test/fake_network_pipe.h | 2 | ||||
| -rw-r--r-- | test/mac/video_renderer_mac.h | 2 | ||||
| -rw-r--r-- | test/test_suite.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/fake_network_pipe.h b/test/fake_network_pipe.h index b9690e79..3dcda298 100644 --- a/test/fake_network_pipe.h +++ b/test/fake_network_pipe.h @@ -13,7 +13,7 @@ #include <queue> -#include "webrtc/base/constructormagic.h" +#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h index 7950b0f9..7701840c 100644 --- a/test/mac/video_renderer_mac.h +++ b/test/mac/video_renderer_mac.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_ #define WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/test/gl/gl_renderer.h" +#include "webrtc/system_wrappers/interface/constructor_magic.h" @class CocoaWindow; diff --git a/test/test_suite.h b/test/test_suite.h index e28fb233..16c03579 100644 --- a/test/test_suite.h +++ b/test/test_suite.h @@ -17,7 +17,7 @@ // instantiate this class in your main function and call its Run method to run // any gtest based tests that are linked into your executable. -#include "webrtc/base/constructormagic.h" +#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { |