Begin adding support for tab mirroring via the MediaStream audio/video capturing

content/renderer/media/media_stream_dispatcher_unittest.cc

Index: content/renderer/media/media_stream_dispatcher_unittest.cc
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc
index 458d61b7e3fdb10bad1b306b615edd2a3d5e1533..cd8eb929c8b13cee048ecd8c832e46b67d8c61e2 100644
--- a/content/renderer/media/media_stream_dispatcher_unittest.cc
+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_stream_messages.h"
+#include "content/public/common/media_stream_request.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "googleurl/src/gurl.h"
@@ -24,6 +25,11 @@ const int kRequestId3 = 30;
 const int kRequestId4 = 40;
 static const char kLabel[] = "test";
 
+const content::MediaStreamDeviceType kAudioType =
+    content::MEDIA_USER_AUDIO_CAPTURE;
+const content::MediaStreamDeviceType kVideoType =
+    content::MEDIA_USER_VIDEO_CAPTURE;
+
 class MockMediaStreamDispatcherEventHandler
     : public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<MockMediaStreamDispatcherEventHandler> {
@@ -108,16 +114,14 @@ TEST(MediaStreamDispatcherTest, BasicStream) {
   media_stream::StreamDeviceInfoArray audio_device_array(1);
   media_stream::StreamDeviceInfo audio_device_info;
   audio_device_info.name = "Microphone";
-  audio_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+  audio_device_info.stream_type = kAudioType;
   audio_device_info.session_id = kAudioSessionId;
   audio_device_array[0] = audio_device_info;
 
   media_stream::StreamDeviceInfoArray video_device_array(1);
   media_stream::StreamDeviceInfo video_device_info;
   video_device_info.name = "Camera";
-  video_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+  video_device_info.stream_type = kVideoType;
   video_device_info.session_id = kVideoSessionId;
   video_device_array[0] = video_device_info;
 
@@ -174,22 +178,24 @@ TEST(MediaStreamDispatcherTest, BasicVideoDevice) {
   GURL security_origin;
 
   int ipc_request_id1 = dispatcher->next_ipc_id_;
-  dispatcher->EnumerateDevices(kRequestId1, handler1.get()->AsWeakPtr(),
-                               content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
-                               security_origin);
+  dispatcher->EnumerateDevices(
+      kRequestId1, handler1.get()->AsWeakPtr(),
+      kVideoType,
+      security_origin);
   int ipc_request_id2 = dispatcher->next_ipc_id_;
   EXPECT_NE(ipc_request_id1, ipc_request_id2);
-  dispatcher->EnumerateDevices(kRequestId2, handler2.get()->AsWeakPtr(),
-                               content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
-                               security_origin);
-  EXPECT_EQ(dispatcher->video_enumeration_state_.requests.size(), size_t(2));
+  dispatcher->EnumerateDevices(
+      kRequestId2, handler2.get()->AsWeakPtr(),
+      kVideoType,
+      security_origin);
+  EXPECT_EQ(dispatcher->enumeration_state_[kVideoType].requests.size(),
+            size_t(2));
 
   media_stream::StreamDeviceInfoArray video_device_array(1);
   media_stream::StreamDeviceInfo video_device_info;
   video_device_info.name = "Camera";
   video_device_info.device_id = "device_path";
-  video_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+  video_device_info.stream_type = kVideoType;
   video_device_info.session_id = kVideoSessionId;
   video_device_array[0] = video_device_info;
 
@@ -199,19 +205,20 @@ TEST(MediaStreamDispatcherTest, BasicVideoDevice) {
   EXPECT_EQ(handler1->request_id_, kRequestId1);
   EXPECT_EQ(handler2->request_id_, kRequestId2);
 
-  EXPECT_EQ(dispatcher->video_enumeration_state_.requests.size(), size_t(2));
+  EXPECT_EQ(dispatcher->enumeration_state_[kVideoType].requests.size(),
+            size_t(2));
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
 
   int ipc_request_id3 = dispatcher->next_ipc_id_;
   dispatcher->OpenDevice(kRequestId3, handler1.get()->AsWeakPtr(),
                          video_device_info.device_id,
-                         content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
+                         kVideoType,
                          security_origin);
   int ipc_request_id4 = dispatcher->next_ipc_id_;
   EXPECT_NE(ipc_request_id3, ipc_request_id4);
   dispatcher->OpenDevice(kRequestId4, handler1.get()->AsWeakPtr(),
                          video_device_info.device_id,
-                         content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
+                         kVideoType,
                          security_origin);
   EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
 
@@ -277,16 +284,14 @@ TEST(MediaStreamDispatcherTest, TestFailure) {
   media_stream::StreamDeviceInfoArray audio_device_array(1);
   media_stream::StreamDeviceInfo audio_device_info;
   audio_device_info.name = "Microphone";
-  audio_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+  audio_device_info.stream_type = kAudioType;
   audio_device_info.session_id = kAudioSessionId;
   audio_device_array[0] = audio_device_info;
 
   media_stream::StreamDeviceInfoArray video_device_array(1);
   media_stream::StreamDeviceInfo video_device_info;
   video_device_info.name = "Camera";
-  video_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+  video_device_info.stream_type = kVideoType;
   video_device_info.session_id = kVideoSessionId;
   video_device_array[0] = video_device_info;
 
@@ -337,16 +342,14 @@ TEST(MediaStreamDispatcherTest, CancelGenerateStream) {
   // Complete the creation of stream1.
   media_stream::StreamDeviceInfo audio_device_info;
   audio_device_info.name = "Microphone";
-  audio_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+  audio_device_info.stream_type = kAudioType;
   audio_device_info.session_id = kAudioSessionId;
   media_stream::StreamDeviceInfoArray audio_device_array(1);
   audio_device_array[0] = audio_device_info;
 
   media_stream::StreamDeviceInfo video_device_info;
   video_device_info.name = "Camera";
-  video_device_info.stream_type =
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+  video_device_info.stream_type = kVideoType;
   video_device_info.session_id = kVideoSessionId;
   media_stream::StreamDeviceInfoArray video_device_array(1);
   video_device_array[0] = video_device_info;