Commit 60b069c7 authored by Caroline Rising's avatar Caroline Rising Committed by Commit Bot

Revert "Clean up old uses of AssistantAudioDecoderFactory"

This reverts commit 184873e8.

Reason for revert: This is causing compile failures on linux-chromeos-google-rel.

Original change's description:
> Clean up old uses of AssistantAudioDecoderFactory
> 
> This CL replaces the last use of old Mojo type of
> AssistantAudioDecoderFactory interface with
> mojo::Remote.
> 
> Bug: 955171
> Change-Id: I16778198e4dc1b7a7693dbbc0f7b85ae4a3d6bbc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1890454
> Reviewed-by: Ken Rockot <rockot@google.com>
> Reviewed-by: Tao Wu <wutao@chromium.org>
> Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#711712}

TBR=rockot@google.com,wutao@chromium.org,gyuyoung@igalia.com

Change-Id: Ibc3450e2774d5d71df873358b393f6a400ea7a3d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 955171
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895735Reviewed-by: default avatarCaroline Rising <corising@chromium.org>
Commit-Queue: Caroline Rising <corising@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711741}
parent 9cba4a2d
......@@ -157,8 +157,8 @@ AudioOutputProviderImpl::AudioOutputProviderImpl(
device_id_(device_id),
media_session_(media_session) {
client_->RequestAudioDecoderFactory(
audio_decoder_factory_remote_.BindNewPipeAndPassReceiver()));
audio_decoder_factory_ = audio_decoder_factory_remote_.get();
mojo::MakeRequest(&audio_decoder_factory_ptr_));
audio_decoder_factory_ = audio_decoder_factory_ptr_.get();
}
AudioOutputProviderImpl::~AudioOutputProviderImpl() = default;
......
......@@ -21,7 +21,6 @@
#include "libassistant/shared/public/platform_audio_output.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/audio/public/mojom/stream_factory.mojom.h"
namespace chromeos {
......@@ -69,8 +68,7 @@ class AudioOutputProviderImpl : public assistant_client::AudioOutputProvider {
VolumeControlImpl volume_control_impl_;
scoped_refptr<base::SequencedTaskRunner> main_task_runner_;
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
mojo::Remote<mojom::AssistantAudioDecoderFactory>
audio_decoder_factory_remote_;
mojom::AssistantAudioDecoderFactoryPtr audio_decoder_factory_ptr_;
mojom::AssistantAudioDecoderFactory* audio_decoder_factory_;
std::string device_id_;
AssistantMediaSession* media_session_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment