Disable getMediaDevices tests. Revert to use getSources instead for getUserMedia tests.

content/browser/media/webrtc_getusermedia_browsertest.cc

Index: content/browser/media/webrtc_getusermedia_browsertest.cc
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
index 709801bb9f24a77260cdeb32a25d16277b790ed3..8821d64f458ac2e53e5f538e02e86b63b89a544a 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -199,7 +199,7 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest,
     NavigateToURL(shell(), url);
 
     std::string devices_as_json = ExecuteJavascriptAndReturnResult(
-        "getMediaDevices()");
+        "getSources()");
     EXPECT_FALSE(devices_as_json.empty());
 
     int error_code;
@@ -223,16 +223,14 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest,
       std::string device_id;
       ASSERT_TRUE((*it)->GetAsDictionary(&dict));
       ASSERT_TRUE(dict->GetString("kind", &kind));
-      ASSERT_TRUE(dict->GetString("deviceId", &device_id));
+      ASSERT_TRUE(dict->GetString("id", &device_id));
       ASSERT_FALSE(device_id.empty());
-      EXPECT_TRUE(kind == "audioinput" || kind == "videoinput" ||
-                  kind == "audiooutput");
-      if (kind == "audioinput") {
+      EXPECT_TRUE(kind == "audio" || kind == "video");
+      if (kind == "audio") {
         audio_ids->push_back(device_id);
-      } else if (kind == "videoinput") {
+      } else if (kind == "video") {
         video_ids->push_back(device_id);
       }
-      // We ignore audio output.
     }
     ASSERT_FALSE(audio_ids->empty());
     ASSERT_FALSE(video_ids->empty());