Let Flash join and be controlled by media session

media/base/media_switches.cc

Index: media/base/media_switches.cc
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 14a86df446acb9057f12bc05ba7743596ec4faf5..c59b4fe7420fd5eb558710dcb5177e176110bb05 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -127,6 +127,11 @@ const char kEnableVp9InMp4[] = "enable-vp9-in-mp4";
 
 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};