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 132 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 86 matching lines @@
   delete req->second;
   requests_.erase(req);
 }
 
 void MediaStreamDeviceSettings::UseFakeUI() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   use_fake_ui_ = true;
 }
 
 }  // namespace media_stream