Revert making trying to authorize a nonsense device id a bad_message.

content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc

 // Copyright 2016 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.
 
 // Unit tests for AudioOutputAuthorizationHandler.
 
 #include "content/browser/renderer_host/media/audio_output_authorization_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0, hashed_id,
                   SecurityOrigin(), listener.GetCallback())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
-TEST_F(AudioOutputAuthorizationHandlerTest,
-       AuthorizeInvalidDeviceId_BadMessage) {
+TEST_F(AudioOutputAuthorizationHandlerTest, AuthorizeInvalidDeviceId_NotFound) {
   std::unique_ptr<TestBrowserContext> context =
       base::MakeUnique<TestBrowserContext>();
   std::unique_ptr<MockRenderProcessHost> RPH =
       base::MakeUnique<MockRenderProcessHost>(context.get());
   MockListener listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
           GetAudioManager(), GetMediaStreamManager(), RPH->GetID(), kSalt);
   EXPECT_EQ(RPH->bad_msg_count(), 0);
 
-  EXPECT_CALL(listener, MockAuthorizationCallback(_, _, _, _)).Times(0);
+  EXPECT_CALL(listener,
+              MockAuthorizationCallback(
+                  media::OUTPUT_DEVICE_STATUS_ERROR_NOT_FOUND, _, _, _))
+      .Times(1);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0,
                   kInvalidDeviceId, SecurityOrigin(), listener.GetCallback())));
 
   SyncWithAllThreads();
-  EXPECT_EQ(RPH->bad_msg_count(), 1);
+  // It is possible to request an invalid device id from JS APIs,
+  // so we don't want to crash the renderer for this.
+  EXPECT_EQ(RPH->bad_msg_count(), 0);
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
   RPH.reset();
   context.reset();
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest,
        AuthorizeNondefaultDeviceIdWithBadOrigin_BadMessage) {
   std::string raw_nondefault_id = GetRawNondefaultId();
   std::string hashed_id = MediaStreamManager::GetHMACForMediaDeviceID(
@@ skipping 41 matching lines @@
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, kSessionId,
                   std::string(), BadSecurityOrigin(), listener.GetCallback())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 }  // namespace content