Move talk/media to webrtc/media

webrtc/media/devices/deviceinfo.h

Index: webrtc/media/devices/deviceinfo.h
diff --git a/webrtc/base/gunit_prod.h b/webrtc/media/devices/deviceinfo.h
similarity index 52%
copy from webrtc/base/gunit_prod.h
copy to webrtc/media/devices/deviceinfo.h
index dc39bbd0eb8a17c62d0d477276300c7ad1ab9336..ef3ad83c946ccd060d60e941abeb2521325a4610 100644
--- a/webrtc/base/gunit_prod.h
+++ b/webrtc/media/devices/deviceinfo.h
@@ -8,17 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_GUNIT_PROD_H_
-#define WEBRTC_BASE_GUNIT_PROD_H_
+#ifndef WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_
+#define WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_
 
-#if defined(WEBRTC_ANDROID)
-// Android doesn't use gtest at all, so anything that relies on gtest should
-// check this define first.
-#define NO_GTEST
-#elif defined (GTEST_RELATIVE_PATH)
-#include "gtest/gtest_prod.h"
-#else
-#include "testing/base/gunit_prod.h"
-#endif
+#include <string>
 
-#endif  // WEBRTC_BASE_GUNIT_PROD_H_
+#include "webrtc/media/devices/devicemanager.h"
+
+namespace cricket {
+
+bool GetUsbId(const Device& device, std::string* usb_id);
+bool GetUsbVersion(const Device& device, std::string* usb_version);
+
+}  // namespace cricket
+
+#endif  // WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_