Implement MediaSession (metadata) per frame [NOT READY, HAS DEPENDENCY]

content/browser/media/android/browser_media_session_manager.h

Index: content/browser/media/android/browser_media_session_manager.h
diff --git a/content/browser/media/android/browser_media_session_manager.h b/content/browser/media/android/browser_media_session_manager.h
index 45e6c7e0eab9bede232370e3c648af8010f3ccbe..f59e8bff3449a23f5399fc2bfef5dc44ae3c23d4 100644
--- a/content/browser/media/android/browser_media_session_manager.h
+++ b/content/browser/media/android/browser_media_session_manager.h
@@ -5,9 +5,12 @@
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_SESSION_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_SESSION_MANAGER_H_
 
+#include <memory>

[whywhat, 2016/09/13 16:23:26]

nit: seems like this is unused

[Zhiqiang Zhang (Slow), 2016/09/13 18:51:52]

Done.

+
 #include "base/macros.h"
 #include "base/optional.h"
 #include "content/common/content_export.h"
+#include "content/public/common/media_metadata.h"

[whywhat, 2016/09/13 16:23:26]

nit: is this needed for Optional? I thought as long as the
BrowserMediaSessionManager dtor is not inlined, the compiler will only need the
dtor of Optional<MediaMetadata> in the .cc file.

[Zhiqiang Zhang (Slow), 2016/09/13 18:51:52]

Probably not. I got a compiler error when moving the include to .cc file.

 
 namespace IPC {
 class Message;
@@ -16,11 +19,13 @@ class Message;
 namespace content {
 
 class RenderFrameHost;
-struct MediaMetadata;
+class WebContentsImpl;
 
 class CONTENT_EXPORT BrowserMediaSessionManager {
  public:
-  explicit BrowserMediaSessionManager(RenderFrameHost* render_frame_host);
+  explicit BrowserMediaSessionManager(RenderFrameHost* render_frame_host,
+                                      WebContentsImpl* contents);
+  virtual ~BrowserMediaSessionManager();
 
   // Message handlers.
   virtual void OnActivate(int session_id, int request_id);
@@ -28,12 +33,16 @@ class CONTENT_EXPORT BrowserMediaSessionManager {
   virtual void OnSetMetadata(
       int session_id, const base::Optional<MediaMetadata>& metadata);
 
+  const base::Optional<MediaMetadata>& media_metadata() const;
   int GetRoutingID() const;
 
   bool Send(IPC::Message* msg);
 
  private:
   RenderFrameHost* const render_frame_host_;
+  WebContentsImpl* const contents_;
+
+  base::Optional<MediaMetadata> media_metadata_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaSessionManager);
 };