[Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

content/common/media/media_stream_options.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/common/media/media_stream_options.h"
 
 #include "base/logging.h"
 
 namespace content {
 
@@ skipping 24 matching lines @@
   }
   return false;
 }
 
 bool GetFirstConstraintByName(const StreamOptions::Constraints& mandatory,
                               const StreamOptions::Constraints& optional,
                               const std::string& name,
                               std::string* value,
                               bool* is_mandatory) {
   if (GetFirstConstraintByName(mandatory, name, value)) {
-      if (is_mandatory)
-        *is_mandatory = true;
-      return true;
-    }
     if (is_mandatory)
-      *is_mandatory = false;
-    return GetFirstConstraintByName(optional, name, value);
+      *is_mandatory = true;
+    return true;
+  }
+  if (is_mandatory)
+    *is_mandatory = false;
+  return GetFirstConstraintByName(optional, name, value);
 }
 
 } // namespace
 
 StreamOptions::StreamOptions()
     : audio_requested(false),
       video_requested(false) {}
 
 StreamOptions::StreamOptions(bool request_audio, bool request_video)
     :  audio_requested(request_audio), video_requested(request_video) {
@@ skipping 59 matching lines @@
 }
 
 // static
 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
                                const StreamDeviceInfo& second) {
   return first.device.IsEqual(second.device) &&
       first.session_id == second.session_id;
 }
 
 }  // namespace content