diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-20 15:20:44 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-20 15:20:44 +0000 |
| commit | 28b7c07f08b7880ccf175b0ef461f65f2e97359f (patch) | |
| tree | 5db7e9ad161c417d62c536eb06a5df4c290e14e5 /test | |
| parent | b139e8a23a4bb15821940cf120f1cd57d2cc80b0 (diff) | |
| download | webrtc-28b7c07f08b7880ccf175b0ef461f65f2e97359f.tar.gz | |
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
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6202 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 3dcda298..b9690e79 100644 --- a/test/fake_network_pipe.h +++ b/test/fake_network_pipe.h @@ -13,7 +13,7 @@ #include <queue> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.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 7701840c..7950b0f9 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 16c03579..e28fb233 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/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { |