media: Make MediaKeys ref-counted.

media/base/browser_cdm_factory.h

Index: media/base/browser_cdm_factory.h
diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index 99525a79b2a5fdda6bc07e96708a3b92bca19e9c..2af47b4c8462a08989ee1d39b4420a40ed6e7e9b 100644
--- a/media/base/browser_cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -9,17 +9,18 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"

[jrummell, 2015/10/29 21:05:17]

Should be "base/memory/ref_counted.h" now?

[xhwang, 2015/10/30 16:20:59]

Done.

-#include "media/base/browser_cdm.h"
 #include "media/base/media_export.h"
+#include "media/base/media_keys.h"
 
 namespace media {
 
+// TODO(xhwang): Merge this with media::CdmFactory.
 class MEDIA_EXPORT BrowserCdmFactory {
  public:
   BrowserCdmFactory() {}
   virtual ~BrowserCdmFactory() {}
 
-  virtual ScopedBrowserCdmPtr CreateBrowserCdm(
+  virtual scoped_refptr<MediaKeys> CreateBrowserCdm(
       const std::string& key_system,
       bool use_hw_secure_codecs,
       const SessionMessageCB& session_message_cb,
@@ -36,12 +37,12 @@ class MEDIA_EXPORT BrowserCdmFactory {
 // BrowserCdmFactory per process.
 void SetBrowserCdmFactory(BrowserCdmFactory* factory);
 
-// Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
+// Creates a MediaKeys for |key_system|. Returns NULL if the CDM cannot be
 // created.
 // |use_hw_secure_codecs| indicates that the CDM should be configured to use
 // hardware-secure codecs (for platforms that support it).
 // TODO(xhwang): Add ifdef for IPC based CDM.
-ScopedBrowserCdmPtr MEDIA_EXPORT
+scoped_refptr<MediaKeys> MEDIA_EXPORT
 CreateBrowserCdm(const std::string& key_system,
                  bool use_hw_secure_codecs,
                  const SessionMessageCB& session_message_cb,