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

chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 163 matching lines @@
 
   bool has_audio_output_devices_initialized_;
   bool has_audio_output_devices_;
 };
 
 static const bool kParamsToRunTestsWith[] = { false, true };
 INSTANTIATE_TEST_CASE_P(WebRtcGetMediaDevicesBrowserTests,
                         WebRtcGetMediaDevicesBrowserTest,
                         testing::ValuesIn(kParamsToRunTestsWith));
 
+// getMediaDevices is removed and will be replaced

[tommi (sloooow) - chröme, 2014/07/03 09:43:04]

nit: s/is/has been

[Henrik Grunell, 2014/07/03 10:44:48]

Done.

+// MediaDevices.enumerateDevices. http://crbug.com/388648.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
-                       GetMediaDevicesWithoutAccess) {
+                       DISABLED_GetMediaDevicesWithoutAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   std::vector<MediaDeviceInfo> devices;
   GetMediaDevices(tab, &devices);
 
   // Labels should be empty if access has not been allowed.
   for (std::vector<MediaDeviceInfo>::iterator it = devices.begin();
        it != devices.end(); ++it) {
     EXPECT_TRUE(it->label.empty());
   }
 }
 
+// getMediaDevices is removed and will be replaced

[tommi (sloooow) - chröme, 2014/07/03 09:43:04]

has been

[Henrik Grunell, 2014/07/03 10:44:48]

Done here and below.

+// MediaDevices.enumerateDevices. http://crbug.com/388648.
 // Disabled, fails due to http://crbug.com/382391.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
                        DISABLED_GetMediaDevicesWithAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   GetUserMediaAndAccept(tab);
 
   std::vector<MediaDeviceInfo> devices;
   GetMediaDevices(tab, &devices);
 
   // Labels should be non-empty if access has been allowed.
   for (std::vector<MediaDeviceInfo>::iterator it = devices.begin();
        it != devices.end(); ++it) {
     EXPECT_TRUE(!it->label.empty());
   }
 }
 
+// getMediaDevices is removed and will be replaced
+// MediaDevices.enumerateDevices. http://crbug.com/388648.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
-                       GetMediaDevicesEqualsGetSourcesWithoutAccess) {
+                       DISABLED_GetMediaDevicesEqualsGetSourcesWithoutAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   std::vector<MediaDeviceInfo> devices;
   GetMediaDevices(tab, &devices);
 
   std::vector<MediaDeviceInfo> sources;
@@ skipping 10 matching lines @@
     } else {
       EXPECT_STREQ(kSourceKindVideoInput, sources_it->kind.c_str());
     }
     EXPECT_TRUE(devices_it->label.empty());
     EXPECT_TRUE(sources_it->label.empty());
     ++sources_it;
   }
   EXPECT_EQ(sources.end(), sources_it);
 }
 
+// getMediaDevices is removed and will be replaced
+// MediaDevices.enumerateDevices. http://crbug.com/388648.
 // Disabled, fails due to http://crbug.com/382391.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
                        DISABLED_GetMediaDevicesEqualsGetSourcesWithAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   GetUserMediaAndAccept(tab);
@@ skipping 14 matching lines @@
       EXPECT_STREQ(kSourceKindAudioInput, sources_it->kind.c_str());
     } else {
       EXPECT_STREQ(kSourceKindVideoInput, sources_it->kind.c_str());
     }
     EXPECT_TRUE(!devices_it->label.empty());
     EXPECT_STREQ(devices_it->label.c_str(), sources_it->label.c_str());
     ++sources_it;
   }
   EXPECT_EQ(sources.end(), sources_it);
 }