Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

content/renderer/media/crypto/proxy_media_keys.cc

 // 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.
 
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 66 matching lines @@
     DLOG(ERROR) << "Unsupported EME CreateSession content type of "
                 << init_data_type;
     promise->reject(
         NOT_SUPPORTED_ERROR,
         0,
         "Unsupported EME CreateSession init data type of " + init_data_type);
     return;
   }
 
   uint32 session_id = CreateSessionId();
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->CreateSession(
       cdm_id_,
       session_id,
       create_session_content_type,
       std::vector<uint8>(init_data, init_data + init_data_length));
 }
 
 void ProxyMediaKeys::LoadSession(
     const std::string& web_session_id,
     scoped_ptr<media::NewSessionCdmPromise> promise) {
   // TODO(xhwang): Check key system and platform support for LoadSession in
   // blink and add NOTREACHED() here.
   DLOG(ERROR) << "ProxyMediaKeys doesn't support session loading.";
   promise->reject(NOT_SUPPORTED_ERROR, 0, "LoadSession() is not supported.");
 }
 
 void ProxyMediaKeys::UpdateSession(
     const std::string& web_session_id,
     const uint8* response,
     int response_length,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   uint32 session_id = LookupSessionId(web_session_id);
   if (!session_id) {
     promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
     return;
   }
 
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->UpdateSession(
       cdm_id_,
       session_id,
       std::vector<uint8>(response, response + response_length));
 }
 
 void ProxyMediaKeys::CloseSession(const std::string& web_session_id,
                                   scoped_ptr<media::SimpleCdmPromise> promise) {
   uint32 session_id = LookupSessionId(web_session_id);
   if (!session_id) {
     promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
     return;
   }
 
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->ReleaseSession(cdm_id_, session_id);
 }
 
 void ProxyMediaKeys::RemoveSession(
     const std::string& web_session_id,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
 }
 
 void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
@@ skipping 145 matching lines @@
 
 scoped_ptr<media::CdmPromise> ProxyMediaKeys::TakePromise(uint32_t session_id) {
   PromiseMap::iterator it = session_id_to_promise_map_.find(session_id);
   // May not be a promise associated with this session for asynchronous events.
   if (it == session_id_to_promise_map_.end())
     return scoped_ptr<media::CdmPromise>();
   return session_id_to_promise_map_.take_and_erase(it);
 }
 
 }  // namespace content