Let Flash join and be controlled by media session

media/base/media_switches.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 "build/build_config.h"
 #include "media/base/media_switches.h"
 
 namespace switches {
 
 // Allow users to specify a custom buffer size for debugging purpose.
@@ skipping 109 matching lines @@
     "disable-rtc-smoothness-algorithm";
 
 // Enables demuxing of vp9 in mp4. Note that this flag will not have any effect
 // if MP4 demuxing is not enabled in the build.
 const char kEnableVp9InMp4[] = "enable-vp9-in-mp4";
 
 }  // namespace switches
 
 namespace media {
 
+// Let flash join and be controlled by media session, only valid when
+// |kEnableDefaultMediaSession| is on.
+const base::Feature kFlashJoinsMediaSession{"flash-join-media-session",
+                                            base::FEATURE_ENABLED_BY_DEFAULT};

[mlamouri (slow - plz ping), 2016/06/30 11:01:18]

Something we could do in a follow-up is to have a multi-choice for media session
on desktop like: "off", "on - wo/ flash", "on - w/ flash".

No need to deal with that now though. Changing this should be seamless.

[Zhiqiang Zhang (Slow), 2016/06/30 12:46:55]

Acknowledged.

+
 // Use shared block-based buffering for media.
 const base::Feature kUseNewMediaCache{"use-new-media-cache",
                                       base::FEATURE_ENABLED_BY_DEFAULT};
 
 }  // namespace media