Index: media/blink/webcontentdecryptionmoduleaccess_impl.h |
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.h b/media/blink/webcontentdecryptionmoduleaccess_impl.h |
index 131bb21e6a8333bef72a3e39b39f92226f6aedd9..a70fca215bb3daa94647a50270311ae21f2d5002 100644 |
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.h |
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.h |
@@ -5,18 +5,12 @@ |
#ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_ |
#define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_ |
-#include "base/basictypes.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
-#include "media/base/cdm_factory.h" |
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h" |
+#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" |
#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h" |
+#include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h" |
- |
-namespace blink { |
-class WebLocalFrame; |
-} |
namespace media { |
@@ -44,14 +38,14 @@ class WebContentDecryptionModuleAccessImpl |
const blink::WebSecurityOrigin& security_origin, |
const base::WeakPtr<WebEncryptedMediaClientImpl>& client); |
- DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleAccessImpl); |
- |
blink::WebString key_system_; |
blink::WebMediaKeySystemConfiguration configuration_; |
blink::WebSecurityOrigin security_origin_; |
// Keep a WeakPtr as client is owned by render_frame_impl. |
base::WeakPtr<WebEncryptedMediaClientImpl> client_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleAccessImpl); |
}; |
} // namespace media |