Shift media_stream::StreamOptions to align with the new getUserMedia spec

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 994725b9308187c29f8c5d4b440e5fe661829e83..28414cdfc5c2839389cc8e0dc4fa0569d33523e6 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -45,7 +45,7 @@ static std::string RandomLabel() {
 static bool Requested(const StreamOptions& options,
                       MediaStreamType stream_type) {
   if (stream_type == content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE &&
-      (options.video_option != StreamOptions::kNoCamera)) {
+      (options.video == true)) {

[scherkus (not reviewing), 2012/04/27 17:52:40]

nit: avoid explicit comparison to "true/false" -- just use the boolean itself in
the comparison

     return true;
   } else if (stream_type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE &&
              options.audio == true) {
@@ -75,7 +75,7 @@ struct MediaStreamManager::DeviceRequest {
         state(content::NUM_MEDIA_STREAM_DEVICE_TYPES, kNotRequested),
         type(kGenerateStream) {
     options.audio = false;
-    options.video_option = StreamOptions::kNoCamera;
+    options.video = false;
   }
 
   DeviceRequest(MediaStreamRequester* requester,
@@ -228,7 +228,7 @@ void MediaStreamManager::EnumerateDevices(
   if (type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE)
     options.audio = true;
   else
-    options.video_option = StreamOptions::kFacingUser;
+    options.video = true;
 
   DeviceRequest new_request = DeviceRequest(requester, options);
   new_request.type = DeviceRequest::kEnumerateDevices;
@@ -252,7 +252,7 @@ void MediaStreamManager::OpenDevice(
   if (type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE)
     options.audio = true;
   else
-    options.video_option = StreamOptions::kFacingUser;
+    options.video = true;
 
   DeviceRequest new_request = DeviceRequest(requester, options);
   new_request.type = DeviceRequest::kOpenDevice;