media: Make MediaKeys ref-counted.

media/base/browser_cdm_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_BROWSER_CDM_FACTORY_H_
 #define MEDIA_BASE_BROWSER_CDM_FACTORY_H_
 
 #include <string>
 
 #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,
       const SessionClosedCB& session_closed_cb,
       const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmFactory);
 };
 
 // Provides a factory for creating BrowserCdm instances. There is only one
 // 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,
                  const SessionClosedCB& session_closed_cb,
                  const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_BROWSER_CDM_FACTORY_H_