remove VideoDeviceError and AudioDeviceError for media stream.

content/renderer/media/media_stream_dispatcher_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_stream_messages.h"
@@ skipping 19 matching lines @@
 const content::MediaStreamDeviceType kVideoType =
     content::MEDIA_DEVICE_VIDEO_CAPTURE;
 const content::MediaStreamDeviceType kNoAudioType =
     content::MEDIA_NO_SERVICE;
 
 class MockMediaStreamDispatcherEventHandler
     : public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<MockMediaStreamDispatcherEventHandler> {
  public:
   MockMediaStreamDispatcherEventHandler()
-      : request_id_(-1),
-        audio_failed(false),
-        video_failed(false) {}
+      : request_id_(-1) {}
 
   virtual void OnStreamGenerated(
       int request_id,
       const std::string &label,
       const media_stream::StreamDeviceInfoArray& audio_device_array,
       const media_stream::StreamDeviceInfoArray& video_device_array) OVERRIDE {
     request_id_ = request_id;
     label_ = label;
   }
 
   virtual void OnStreamGenerationFailed(int request_id) OVERRIDE {
     request_id_ = request_id;
   }
 
-  virtual void OnAudioDeviceFailed(const std::string& label,
-                                   int index) OVERRIDE {
-    audio_failed = true;
-  }
-
-  virtual void OnVideoDeviceFailed(const std::string& label,
-                                   int index) OVERRIDE {
-    video_failed = true;
-  }
-
   virtual void OnDevicesEnumerated(
       int request_id,
       const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE {
     request_id_ = request_id;
   }
 
   virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE {
     request_id_ = request_id;
   }
 
   virtual void OnDeviceOpened(
       int request_id,
       const std::string& label,
       const media_stream::StreamDeviceInfo& video_device) OVERRIDE {
     request_id_ = request_id;
     label_ = label;
   }
 
   virtual void OnDeviceOpenFailed(int request_id) OVERRIDE {
     request_id_ = request_id;
   }
 
   int request_id_;
   std::string label_;
-  bool audio_failed;
-  bool video_failed;
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcherEventHandler);
 };
 
 }  // namespace
 
 TEST(MediaStreamDispatcherTest, BasicStream) {
   scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
@@ skipping 265 matching lines @@
 
   // Complete the creation of stream1.
   std::string stream_label1 = std::string("stream1");
   dispatcher->OnMessageReceived(MediaStreamMsg_StreamGenerated(
       kRouteId, ipc_request_id1, stream_label1,
       audio_device_array, video_device_array));
   EXPECT_EQ(handler->request_id_, kRequestId1);
   EXPECT_EQ(handler->label_, stream_label1);
   EXPECT_EQ(dispatcher->video_session_id(stream_label1, 0), kVideoSessionId);
 
-  // Test failure of the video device.
-  dispatcher->OnMessageReceived(
-      MediaStreamHostMsg_VideoDeviceFailed(kRouteId, stream_label1, 0));
-  EXPECT_EQ(handler->video_failed, true);
-  EXPECT_EQ(handler->audio_failed, false);
-  // Make sure the audio device still exist but not the video device.
-  EXPECT_EQ(dispatcher->audio_session_id(stream_label1, 0), kAudioSessionId);
-
-  // Test failure of the audio device.
-  dispatcher->OnMessageReceived(
-      MediaStreamHostMsg_AudioDeviceFailed(kRouteId, stream_label1, 0));
-  EXPECT_EQ(handler->audio_failed, true);
-
   // Stop stream1.
   dispatcher->StopStream(stream_label1);
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
 }
 
 TEST(MediaStreamDispatcherTest, CancelGenerateStream) {
   scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
@@ skipping 25 matching lines @@
   video_device_array[0] = video_device_info;
 
   std::string stream_label1 = "stream1";
   dispatcher->OnMessageReceived(MediaStreamMsg_StreamGenerated(
       kRouteId, ipc_request_id1, stream_label1,
       audio_device_array, video_device_array));
   EXPECT_EQ(handler->request_id_, kRequestId1);
   EXPECT_EQ(handler->label_, stream_label1);
   EXPECT_EQ(0u, dispatcher->requests_.size());
 }