Migrating MediaSession messages to mojo

third_party/WebKit/Source/modules/mediasession/MediaSession.h

Index: third_party/WebKit/Source/modules/mediasession/MediaSession.h
diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSession.h b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
index 32470033d25d71e78df11aa6a163ca097f976d68..81b473a1f2bf495208e28c29ad1a7e582b3d6281 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.h
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
@@ -5,16 +5,16 @@
 #ifndef MediaSession_h
 #define MediaSession_h
 
-#include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "modules/ModulesExport.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/mediasession/WebMediaSession.h"
+#include "public/platform/modules/mediasession/media_session.mojom-blink.h"
 #include <memory>
 
 namespace blink {
 
 class MediaMetadata;
+

[foolip, 2016/10/03 16:26:35]

Cat on keyboard?

[Zhiqiang Zhang (Slow), 2016/10/03 20:21:00]

Done.

 class ScriptState;
 
 class MODULES_EXPORT MediaSession final
@@ -23,25 +23,22 @@ class MODULES_EXPORT MediaSession final
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  static MediaSession* create(ExecutionContext*, ExceptionState&);
-
-  WebMediaSession* getWebMediaSession() { return m_webMediaSession.get(); }
+  static MediaSession* create();
 
-  ScriptPromise activate(ScriptState*);
-  ScriptPromise deactivate(ScriptState*);
-
-  void setMetadata(MediaMetadata*);
-  MediaMetadata* metadata() const;
+  void setMetadata(ScriptState*, MediaMetadata*);
+  MediaMetadata* metadata(ScriptState*) const;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class MediaSessionTest;
 
-  explicit MediaSession(std::unique_ptr<WebMediaSession>);
+  MediaSession();
+
+  mojom::blink::MediaSession* getService(ScriptState*);

[foolip, 2016/10/03 16:26:35]

Document when this can return null and not?

[Zhiqiang Zhang (Slow), 2016/10/03 20:21:00]

Done.

 
-  std::unique_ptr<WebMediaSession> m_webMediaSession;
   Member<MediaMetadata> m_metadata;
+  mojom::blink::MediaSessionPtr m_service;
 };
 
 }  // namespace blink