media: Make MediaKeys ref-counted.

media/base/cdm_initialized_promise.h

 // Copyright 2015 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_CDM_INITIALIZED_PROMISE_H_
 #define MEDIA_BASE_CDM_INITIALIZED_PROMISE_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/cdm_factory.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 
 namespace media {
 
 // Promise to be resolved when the CDM is initialized. It owns the MediaKeys
 // object until the initialization completes, which it then passes to
 // |cdm_created_cb|.
 class MEDIA_EXPORT CdmInitializedPromise : public SimpleCdmPromise {
  public:
   CdmInitializedPromise(const CdmCreatedCB& cdm_created_cb,
-                        scoped_ptr<MediaKeys> cdm);
+                        const scoped_refptr<MediaKeys>& cdm);
   ~CdmInitializedPromise() override;
 
   // SimpleCdmPromise implementation.
   void resolve() override;
   void reject(MediaKeys::Exception exception_code,
               uint32 system_code,
               const std::string& error_message) override;
 
  private:
   CdmCreatedCB cdm_created_cb_;
-  scoped_ptr<MediaKeys> cdm_;
+
+  // Holds a ref-count of the CDM.
+  scoped_refptr<MediaKeys> cdm_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_