Let Flash join and be controlled by media session

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 4cc0c5bc1e2e1d7013ff2b7530738a287958566f..ad392c731c1dd6f47bbd0f0bee194edcca4133b8 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -92,6 +92,10 @@ struct ResourceRequestDetails;
 class WebContentsAndroid;
 #endif
 
+#if defined(ENABLE_PLUGINS)
+class PepperPlaybackObserver;
+#endif
+
 // Factory function for the implementations that content knows about. Takes
 // ownership of |delegate|.
 WebContentsView* CreateWebContentsView(
@@ -944,11 +948,13 @@ class CONTENT_EXPORT WebContentsImpl
                    const base::ListValue& args);
   void OnUpdatePageImportanceSignals(const PageImportanceSignals& signals);
 #if defined(ENABLE_PLUGINS)
-  void OnPepperInstanceCreated();
-  void OnPepperInstanceDeleted();
+  void OnPepperInstanceCreated(int32_t pp_instance);
+  void OnPepperInstanceDeleted(int32_t pp_instance);
   void OnPepperPluginHung(int plugin_child_id,
                           const base::FilePath& path,
                           bool is_hung);
+  void OnPepperStartsPlayback(int32_t pp_instance);
+  void OnPepperStopsPlayback(int32_t pp_instance);
   void OnPluginCrashed(const base::FilePath& plugin_path,
                        base::ProcessId plugin_pid);
   void OnRequestPpapiBrokerPermission(int routing_id,
@@ -1383,6 +1389,11 @@ class CONTENT_EXPORT WebContentsImpl
   // Manages media players, CDMs, and power save blockers for media.
   std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_;
 
+#if defined(ENABLE_PLUGINS)
+  // Observes pepper playback changes, and notifies MediaSession.
+  std::unique_ptr<PepperPlaybackObserver> pepper_playback_observer_;
+#endif  // defined(ENABLE_PLUGINS)
+
   std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
 
   PageImportanceSignals page_importance_signals_;