Make unprefixed EME APIs use platform and Chromium.

Source/core/platform/graphics/CDMSessionChromium.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LinkResource_h
-#define LinkResource_h
+#ifndef CDMSessionChromium_h
+#define CDMSessionChromium_h
 
-#include "core/loader/cache/CachedResourceRequest.h"
-#include "core/platform/KURL.h"
-#include "wtf/Forward.h"
-#include "wtf/RefCounted.h"
+#include "core/platform/graphics/CDMSession.h"
+#include "public/platform/WebCDMSession.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/text/WTFString.h"
 
+namespace WebKit {
+class WebCDM;
+}
+
 namespace WebCore {
 
-class HTMLLinkElement;
+class CDMSessionChromium : public CDMSession, private WebKit::WebCDMSession::Client {

[abarth-chromium, 2013/06/07 00:08:23]

There's no need for any of these Chromium files.  You can just fold them into
the base class.

[ddorwin, 2013/06/10 22:52:34]

Done.

+public:
+    CDMSessionChromium(WebKit::WebCDM&, CDMSessionClient*);
+    virtual ~CDMSessionChromium() { }
 
-class LinkResource : public RefCounted<LinkResource> {
-public:
-    enum Type {
-        Style,
-        Import
-    };
+    // CDMSession
+    virtual WTF::String sessionId() const OVERRIDE;
+    virtual void generateKeyRequest(const WTF::String& mimeType, const WTF::Uint8Array& initData) OVERRIDE;
+    virtual void update(const WTF::Uint8Array& key) OVERRIDE;
+    virtual void close() OVERRIDE;
 
-    explicit LinkResource(HTMLLinkElement*);
-    virtual ~LinkResource();
-
-    virtual Type type() const = 0;
-    virtual void process() = 0;
-    virtual void ownerRemoved() = 0;
-
-protected:
-    HTMLLinkElement* m_owner;
-};
-
-class LinkRequestBuilder {
-public:
-    explicit LinkRequestBuilder(HTMLLinkElement* owner);
-
-    bool isValid() const { return !m_url.isEmpty() && m_url.isValid(); }
-    const KURL& url() const { return m_url; }
-    const String& charset() const { return m_charset; }
-    CachedResourceRequest build(bool blocking) const;
+    // WebKit::WebCDMSession::Client
+    virtual void keyAdded() OVERRIDE;
+    virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
+    virtual void keyMessage(const unsigned char* message, unsigned messageLength, const WebKit::WebURL& destinationURL) OVERRIDE;
 
 private:
-    HTMLLinkElement* m_owner;
-    KURL m_url;
-    String m_charset;
+    OwnPtr<WebKit::WebCDMSession> m_session;
+
+    CDMSessionClient* m_client;
 };
 
 } // namespace WebCore
 
-#endif // LinkResource_h
+#endif // CDMSessionChromium_h