Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/browser_cdm_factory.cc

Index: media/base/browser_cdm_factory.cc
diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc
index 88445d890b754d5b2fb261a5b89977e97c1d6715..73fd4c72e22589c66746de90f7b34665019b163d 100644
--- a/media/base/browser_cdm_factory.cc
+++ b/media/base/browser_cdm_factory.cc
@@ -21,7 +21,7 @@ void SetBrowserCdmFactory(BrowserCdmFactory* factory) {
   g_cdm_factory = factory;
 }
 
-scoped_ptr<BrowserCdm> CreateBrowserCdm(
+ScopedBrowserCdmPtr CreateBrowserCdm(
     const std::string& key_system,
     bool use_hw_secure_codecs,
     const SessionMessageCB& session_message_cb,
@@ -34,7 +34,7 @@ scoped_ptr<BrowserCdm> CreateBrowserCdm(
     SetBrowserCdmFactory(new BrowserCdmFactoryAndroid);
 #else
     LOG(ERROR) << "Cannot create BrowserCdm: no BrowserCdmFactory available!";
-    return scoped_ptr<BrowserCdm>();
+    return ScopedBrowserCdmPtr();
 #endif
   }