Move talk/media to webrtc/media

webrtc/media/base/capturemanager_unittest.cc

Index: webrtc/media/base/capturemanager_unittest.cc
diff --git a/talk/media/base/capturemanager_unittest.cc b/webrtc/media/base/capturemanager_unittest.cc
similarity index 97%
rename from talk/media/base/capturemanager_unittest.cc
rename to webrtc/media/base/capturemanager_unittest.cc
index 4a75fc368299bdab98503aa70948fe9b2aec08d9..02a88b1dc178afcb37e2ed2f39814c524445fcdc 100644
--- a/talk/media/base/capturemanager_unittest.cc
+++ b/webrtc/media/base/capturemanager_unittest.cc
@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/media/base/capturemanager.h"
+#include "webrtc/media/base/capturemanager.h"
 
-#include "talk/media/base/fakevideocapturer.h"
-#include "talk/media/base/fakevideorenderer.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/sigslot.h"
+#include "webrtc/media/base/fakevideocapturer.h"
+#include "webrtc/media/base/fakevideorenderer.h"
 
 const int kMsCallbackWait = 50;
 
@@ -58,7 +58,7 @@ class CaptureManagerTest : public ::testing::Test, public sigslot::has_slots<> {
   }
   void PopulateSupportedFormats() {
     std::vector<cricket::VideoFormat> formats;
-    for (int i = 0; i < arraysize(kCameraFormats); ++i) {
+    for (uint32_t i = 0; i < arraysize(kCameraFormats); ++i) {
       formats.push_back(cricket::VideoFormat(kCameraFormats[i]));
     }
     video_capturer_.ResetSupportedFormats(formats);