Commit f8039fb5 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

assistant: cleanup deprecated mojom interface

Bug: None
Test: locally compile
Change-Id: I80d12ad3edd287aa9ad7932dea60a1a5f8608b1b
Reviewed-on: https://chromium-review.googlesource.com/1217721
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarMuyuan Li <muyuanli@chromium.org>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590544}
parent 27e9aed1
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include "chromeos/services/assistant/platform/audio_output_provider_impl.h" #include "chromeos/services/assistant/platform/audio_output_provider_impl.h"
#include <memory>
#include <utility>
#include "base/callback.h" #include "base/callback.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/run_loop.h" #include "base/run_loop.h"
...@@ -98,8 +101,8 @@ TEST_F(AudioDeviceOwnerTest, BufferFilling) { ...@@ -98,8 +101,8 @@ TEST_F(AudioDeviceOwnerTest, BufferFilling) {
delegate.set_num_of_bytes_to_fill(200); delegate.set_num_of_bytes_to_fill(200);
delegate.Reset(); delegate.Reset();
auto owner = auto owner = std::make_unique<AudioDeviceOwner>(
std::make_unique<AudioDeviceOwner>(base::ThreadTaskRunnerHandle::Get()); base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get());
// Upon start, it will start to fill the buffer. // Upon start, it will start to fill the buffer.
owner->StartOnMainThread(&delegate, nullptr, format); owner->StartOnMainThread(&delegate, nullptr, format);
delegate.Wait(); delegate.Wait();
......
...@@ -134,26 +134,6 @@ interface Client { ...@@ -134,26 +134,6 @@ interface Client {
ax.mojom.AssistantTree? structure); ax.mojom.AssistantTree? structure);
}; };
// Interface for assistant to call into browser for audio input related
// functions.
interface AudioInput {
// Registers audio input observer. We assume dual-channel, 16kHz and signed
// 32-bit int interleaved format. Audio stream starts recording as soon as
// the first observer is added. And will stop recording if last observer is
// closed.
AddObserver(AudioInputObserver observer);
};
// Observer for assistant to receive audio input data.
interface AudioInputObserver {
// Notifies that audio frames are available.
// TODO(muyuanli): Use data pipe.
OnAudioInputFramesAvailable(array<int32> buffer, uint32 frame_count,
mojo_base.mojom.TimeTicks timestamp);
// Notifies that audio input stream is closed.
OnAudioInputClosed();
};
// Interface for assistant to call into browser to perform device actions. // Interface for assistant to call into browser to perform device actions.
interface DeviceActions { interface DeviceActions {
// Enables or disables WiFi. // Enables or disables WiFi.
......
...@@ -123,25 +123,6 @@ class FakeAssistantClient : mojom::Client { ...@@ -123,25 +123,6 @@ class FakeAssistantClient : mojom::Client {
DISALLOW_COPY_AND_ASSIGN(FakeAssistantClient); DISALLOW_COPY_AND_ASSIGN(FakeAssistantClient);
}; };
class FakeAudioInput : mojom::AudioInput {
public:
FakeAudioInput() : binding_(this) {}
mojom::AudioInputPtr CreateInterfacePtrAndBind() {
mojom::AudioInputPtr ptr;
binding_.Bind(mojo::MakeRequest(&ptr));
return ptr;
}
private:
// mojom::AudioInput:
void AddObserver(mojom::AudioInputObserverPtr observer) override {}
mojo::Binding<mojom::AudioInput> binding_;
DISALLOW_COPY_AND_ASSIGN(FakeAudioInput);
};
class FakeDeviceActions : mojom::DeviceActions { class FakeDeviceActions : mojom::DeviceActions {
public: public:
FakeDeviceActions() : binding_(this) {} FakeDeviceActions() : binding_(this) {}
...@@ -249,7 +230,6 @@ class ServiceTest : public service_manager::test::ServiceTest { ...@@ -249,7 +230,6 @@ class ServiceTest : public service_manager::test::ServiceTest {
fake_identity_manager_ = std::make_unique<FakeIdentityManager>(); fake_identity_manager_ = std::make_unique<FakeIdentityManager>();
fake_assistant_client_ = std::make_unique<FakeAssistantClient>(); fake_assistant_client_ = std::make_unique<FakeAssistantClient>();
fake_device_actions_ = std::make_unique<FakeDeviceActions>(); fake_device_actions_ = std::make_unique<FakeDeviceActions>();
fake_audio_input_ = std::make_unique<FakeAudioInput>();
fake_assistant_manager_ptr_ = new FakeAssistantManagerServiceImpl(); fake_assistant_manager_ptr_ = new FakeAssistantManagerServiceImpl();
std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
...@@ -298,7 +278,6 @@ class ServiceTest : public service_manager::test::ServiceTest { ...@@ -298,7 +278,6 @@ class ServiceTest : public service_manager::test::ServiceTest {
std::unique_ptr<FakeIdentityManager> fake_identity_manager_; std::unique_ptr<FakeIdentityManager> fake_identity_manager_;
std::unique_ptr<FakeAssistantClient> fake_assistant_client_; std::unique_ptr<FakeAssistantClient> fake_assistant_client_;
std::unique_ptr<FakeAudioInput> fake_audio_input_;
std::unique_ptr<FakeDeviceActions> fake_device_actions_; std::unique_ptr<FakeDeviceActions> fake_device_actions_;
FakeAssistantManagerServiceImpl* fake_assistant_manager_ptr_; FakeAssistantManagerServiceImpl* fake_assistant_manager_ptr_;
......
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