Revert of Deletes mojo::Callback

media/mojo/services/mojo_decryptor_service.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_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <unordered_map>
 
-#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/decryptor.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 
 namespace media {
 
 class DecoderBuffer;
 class MediaKeys;
 
 // A mojom::Decryptor implementation. This object is owned by the creator,
 // and uses a weak binding across the mojo interface.
 class MojoDecryptorService : public mojom::Decryptor {
  public:
   // Constructs a MojoDecryptorService and binds it to the |request|. Keeps a
   // copy of |cdm| to prevent it from being deleted as long as it is needed.
   // |error_handler| will be called if a connection error occurs.
   MojoDecryptorService(const scoped_refptr<MediaKeys>& cdm,
                        mojo::InterfaceRequest<mojom::Decryptor> request,
-                       const base::Closure& error_handler);
+                       const mojo::Closure& error_handler);
 
   ~MojoDecryptorService() final;
 
   // mojom::Decryptor implementation.
   void Initialize(mojo::ScopedDataPipeConsumerHandle receive_pipe,
                   mojo::ScopedDataPipeProducerHandle transmit_pipe) final;
   void Decrypt(mojom::DemuxerStream::Type stream_type,
                mojom::DecoderBufferPtr encrypted,
                const DecryptCallback& callback) final;
   void CancelDecrypt(mojom::DemuxerStream::Type stream_type) final;
@@ skipping 59 matching lines @@
 
   base::WeakPtr<MojoDecryptorService> weak_this_;
   base::WeakPtrFactory<MojoDecryptorService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoDecryptorService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_