Revert of Use spec-compliant algorithm to select video devices in getUserMedia.

content/browser/webrtc/webrtc_getusermedia_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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/stringprintf.h"
@@ skipping 396 matching lines @@
                        GetUserMediaWithInvalidMandatorySourceID) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   std::vector<std::string> audio_ids;
   std::vector<std::string> video_ids;
   GetInputDevices(&audio_ids, &video_ids);
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
 
   // Test with invalid mandatory audio sourceID.
-  // TODO(guidou): Update error string when spec-compliant constraint resolution
-  // for audio is implemented. See http://crbug.com/657733.
   NavigateToURL(shell(), url);
   EXPECT_EQ("DevicesNotFoundError", ExecuteJavascriptAndReturnResult(
       GenerateGetUserMediaWithMandatorySourceID(
           kGetUserMediaAndExpectFailure,
           "something invalid",
           video_ids[0])));
 
   // Test with invalid mandatory video sourceID.
-  EXPECT_EQ("ConstraintNotSatisfiedError",
-            ExecuteJavascriptAndReturnResult(
-                GenerateGetUserMediaWithMandatorySourceID(
-                    kGetUserMediaAndExpectFailure, audio_ids[0],
-                    "something invalid")));
-
-  // Test with empty mandatory audio sourceID.
-  // TODO(guidou): Update error string when spec-compliant constraint resolution
-  // for audio is implemented. See http://crbug.com/657733.
   EXPECT_EQ("DevicesNotFoundError", ExecuteJavascriptAndReturnResult(
       GenerateGetUserMediaWithMandatorySourceID(
           kGetUserMediaAndExpectFailure,
+          audio_ids[0],
+          "something invalid")));
+
+  // Test with empty mandatory audio sourceID.
+  EXPECT_EQ("DevicesNotFoundError", ExecuteJavascriptAndReturnResult(
+      GenerateGetUserMediaWithMandatorySourceID(
+          kGetUserMediaAndExpectFailure,
           "",
           video_ids[0])));
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        GetUserMediaWithInvalidOptionalSourceID) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   std::vector<std::string> audio_ids;
   std::vector<std::string> video_ids;
@@ skipping 330 matching lines @@
       base::Bind(&VerifyDisableLocalEcho, true));
   call = GenerateGetUserMediaWithDisableLocalEcho(
       "getUserMediaAndExpectSuccess", "true");
   ExecuteJavascriptAndWaitForOk(call);
 
   manager->SetGenerateStreamCallbackForTesting(
       MediaStreamManager::GenerateStreamTestCallback());
 }
 
 }  // namespace content