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

content/renderer/media/media_stream_impl.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/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 165 matching lines @@
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) {
   // Save histogram data so we can see how much GetUserMedia is used.
   // The histogram counts the number of calls to the JS API
   // webGetUserMedia.
   UMA_HISTOGRAM_COUNTS_100(kHistogramGetUserMedia, 1);
   DCHECK(CalledOnValidThread());
   DCHECK(!user_media_request.isNull());
   int request_id = g_next_request_id++;
 
   bool audio = user_media_request.audio();
-  media_stream::StreamOptions::VideoOption video_option =
-      media_stream::StreamOptions::kNoCamera;
-  if (user_media_request.video())
-    video_option = media_stream::StreamOptions::kFacingBoth;
+  bool video = user_media_request.video();
 
   std::string security_origin = UTF16ToUTF8(
       user_media_request.securityOrigin().toString());
 
   DVLOG(1) << "MediaStreamImpl::generateStream(" << request_id << ", [ "
            << (audio ? "audio" : "")
            << (user_media_request.video() ? " video" : "") << "], "
            << security_origin << ")";
 
   user_media_requests_.insert(
       std::pair<int, WebKit::WebUserMediaRequest>(
           request_id, user_media_request));
 
   media_stream_dispatcher_->GenerateStream(
       request_id,
       AsWeakPtr(),
-      media_stream::StreamOptions(audio, video_option),
+      media_stream::StreamOptions(audio, video),
       security_origin);
 }
 
 void MediaStreamImpl::cancelUserMediaRequest(
     const WebKit::WebUserMediaRequest& user_media_request) {
   DCHECK(CalledOnValidThread());
   // TODO(grunell): Implement.
   NOTIMPLEMENTED();
 }
 
@@ skipping 302 matching lines @@
   return rtc_video_decoder;
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper(
     RTCVideoDecoder* decoder)
     : rtc_video_decoder_(decoder) {
 }
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {
 }