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

content/browser/renderer_host/media/media_stream_device_settings.cc

Index: content/browser/renderer_host/media/media_stream_device_settings.cc
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index af13453e59aefdc03a69c5eae72092fffe8bbe98..3e65642d861db117ae476c723c935aff3eedf0b2 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -153,7 +153,7 @@ void MediaStreamDeviceSettings::AvailableDevices(
   if (request->options.audio) {
     num_media_requests++;
   }
-  if (request->options.video_option != StreamOptions::kNoCamera) {
+  if (request->options.video) {
     num_media_requests++;
   }
 
@@ -277,7 +277,7 @@ std::string MediaStreamDeviceSettings::FindReadyRequestForView(
         // request.
         continue;
       }
-      if (request->options.video_option != StreamOptions::kNoCamera &&
+      if (request->options.video &&
           request->devices_full[
               content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE].empty()) {
         // Video requested, but no devices enumerated yet. Continue to next