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

content/browser/renderer_host/media/media_stream_device_settings.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 "content/browser/renderer_host/media/media_stream_device_settings.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 135 matching lines @@
   MediaStreamDeviceSettingsRequest* request = request_it->second;
   DCHECK_EQ(request->devices_full.count(stream_type), static_cast<size_t>(0)) <<
       "This request already has a list of devices for this stream type.";
   request->devices_full[stream_type] = devices;
 
   // Check if we're done.
   size_t num_media_requests = 0;
   if (request->options.audio) {
     num_media_requests++;
   }
-  if (request->options.video_option != StreamOptions::kNoCamera) {
+  if (request->options.video) {
     num_media_requests++;
   }
 
   if (request->devices_full.size() == num_media_requests) {
     // We have all answers needed.
     if (!use_fake_ui_) {
       // Abort if the task was already posted: wait for it to PostResponse.
       if (request->posted_task) {
         return;
       }
@@ skipping 103 matching lines @@
         it->second->render_view_id == render_view_id) {
       // This request belongs to the given render view.
       MediaStreamDeviceSettingsRequest* request = it->second;
       if (request->options.audio &&
           request->devices_full[
               content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE].empty()) {
         // Audio requested, but no devices enumerated yet. Continue to next
         // 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
         // request.
         continue;
       }
       // This request belongs to the same view as the treated request and is
       // ready to be requested. Return its label.
       return it->first;
     }
@@ skipping 27 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &content::ContentBrowserClient::RequestMediaAccessPermission,
           base::Unretained(content::GetContentClient()->browser()),
           request, callback));
 
 }
 
 }  // namespace media_stream