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

content/renderer/media/crypto/ppapi_decryptor.cc

 // Copyright 2013 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/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 191 matching lines @@
     return;
   }
 
   // TODO(jrummell): Intercepting the promise should not be necessary once
   // OnSessionKeysChange() is called in all cases. http://crbug.com/413413.
   scoped_ptr<SessionLoadedPromise> session_loaded_promise(
       new SessionLoadedPromise(promise.Pass(),
                                base::Bind(&PpapiDecryptor::ResumePlayback,
                                           weak_ptr_factory_.GetWeakPtr())));
 
-  CdmDelegate()->LoadSession(
-      web_session_id,
-      session_loaded_promise.PassAs<media::NewSessionCdmPromise>());
+  CdmDelegate()->LoadSession(web_session_id, session_loaded_promise.Pass());
 }
 
 void PpapiDecryptor::UpdateSession(
     const std::string& web_session_id,
     const uint8* response,
     int response_length,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
 
   if (!CdmDelegate()) {
     promise->reject(INVALID_STATE_ERROR, 0, "CdmDelegate() does not exist.");
     return;
   }
 
   // TODO(jrummell): Intercepting the promise should not be necessary once
   // OnSessionKeysChange() is called in all cases. http://crbug.com/413413.
   scoped_ptr<SessionUpdatedPromise> session_updated_promise(
       new SessionUpdatedPromise(promise.Pass(),
                                 base::Bind(&PpapiDecryptor::ResumePlayback,
                                            weak_ptr_factory_.GetWeakPtr())));
-  CdmDelegate()->UpdateSession(
-      web_session_id,
-      response,
-      response_length,
-      session_updated_promise.PassAs<media::SimpleCdmPromise>());
+  CdmDelegate()->UpdateSession(web_session_id,
+                               response,
+                               response_length,
+                               session_updated_promise.Pass());
 }
 
 void PpapiDecryptor::CloseSession(const std::string& web_session_id,
                                   scoped_ptr<media::SimpleCdmPromise> promise) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
 
   if (!CdmDelegate()) {
     promise->reject(INVALID_STATE_ERROR, 0, "CdmDelegate() does not exist.");
     return;
   }
@@ skipping 295 matching lines @@
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content