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 07c250043c9f700083439d3df9c3b3dbf94fbb80..1a6e479cea053e5a822bc3d50ed51d4330979607 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.h
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
@@ -5,42 +5,38 @@
 #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;
 class ScriptState;
+class MediaMetadata;

[xhwang, 2016/09/30 23:24:58]

why switch the order?

[Zhiqiang Zhang (Slow), 2016/10/03 14:31:13]

Oops, accidental change. Fixed.

 
 class MODULES_EXPORT MediaSession final
     : public GarbageCollectedFinalized<MediaSession>
     , public ScriptWrappable {
     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::MediaSessionService* getService(ScriptState*);
 
-    std::unique_ptr<WebMediaSession> m_webMediaSession;
     Member<MediaMetadata> m_metadata;
+    mojom::blink::MediaSessionServicePtr m_service;
 };
 
 } // namespace blink