| Index: webrtc/media/devices/devicemanager_unittest.cc
|
| diff --git a/talk/media/devices/devicemanager_unittest.cc b/webrtc/media/devices/devicemanager_unittest.cc
|
| similarity index 98%
|
| rename from talk/media/devices/devicemanager_unittest.cc
|
| rename to webrtc/media/devices/devicemanager_unittest.cc
|
| index 606a05e7c34d1ab34e870fd5c832eac140b4852a..1fded4bab194b9541affa4cd1c2947f01e37f12f 100644
|
| --- a/talk/media/devices/devicemanager_unittest.cc
|
| +++ b/webrtc/media/devices/devicemanager_unittest.cc
|
| @@ -25,7 +25,7 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "talk/media/devices/devicemanager.h"
|
| +#include "webrtc/media/devices/devicemanager.h"
|
|
|
| #ifdef WIN32
|
| #include <objbase.h>
|
| @@ -33,12 +33,6 @@
|
| #endif
|
| #include <string>
|
|
|
| -#include "talk/media/base/fakevideocapturer.h"
|
| -#include "talk/media/base/screencastid.h"
|
| -#include "talk/media/base/testutils.h"
|
| -#include "talk/media/base/videocapturerfactory.h"
|
| -#include "talk/media/devices/filevideocapturer.h"
|
| -#include "talk/media/devices/v4llookup.h"
|
| #include "webrtc/base/arraysize.h"
|
| #include "webrtc/base/fileutils.h"
|
| #include "webrtc/base/gunit.h"
|
| @@ -47,6 +41,12 @@
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/stream.h"
|
| #include "webrtc/base/windowpickerfactory.h"
|
| +#include "webrtc/media/base/fakevideocapturer.h"
|
| +#include "webrtc/media/base/screencastid.h"
|
| +#include "webrtc/media/base/testutils.h"
|
| +#include "webrtc/media/base/videocapturerfactory.h"
|
| +#include "webrtc/media/devices/filevideocapturer.h"
|
| +#include "webrtc/media/devices/v4llookup.h"
|
|
|
| #ifdef WEBRTC_LINUX
|
| // TODO(juberti): Figure out why this doesn't compile on Windows.
|
|
|