Convert Pass()→std::move() in //media

media/mojo/services/mojo_cdm.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_MOJO_SERVICES_MOJO_CDM_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_H_
 
 #include <stdint.h>
-
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/services/mojo_type_trait.h"
@@ skipping 94 matching lines @@
   // We have to inline this method, since MS VS 2013 compiler fails to compile
   // it when this method is not inlined. It fails with error C2244
   // "unable to match function definition to an existing declaration".
   template <typename... T>
   void OnPromiseResult(scoped_ptr<CdmPromiseTemplate<T...>> promise,
                        interfaces::CdmPromiseResultPtr result,
                        typename MojoTypeTrait<T>::MojoType... args) {
     if (result->success)
       promise->resolve(args.template To<T>()...);  // See ISO C++03 14.2/4.
     else
-      RejectPromise(promise.Pass(), result.Pass());
+      RejectPromise(std::move(promise), std::move(result));
   }
 
   interfaces::ContentDecryptionModulePtr remote_cdm_;
   mojo::Binding<ContentDecryptionModuleClient> binding_;
   int cdm_id_;
 
   // Keep track of the DecryptorPtr in order to do lazy initialization of
   // MojoDecryptor.
   interfaces::DecryptorPtr decryptor_ptr_;
   scoped_ptr<MojoDecryptor> decryptor_;
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
   LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_H_