Reland "Fix build errors with upstream libassistant change"

This is a reland of 89dbe1f8

Original change's description:
> Fix build errors with upstream libassistant change
> 
> Test: build locally with upreved libassistant
> Bug: None
> Change-Id: I3db67f5a77824fcf0831447f353baba6167b0801
> Reviewed-on: https://chromium-review.googlesource.com/1025268
> Reviewed-by: Muyuan Li <muyuanli@chromium.org>
> Commit-Queue: Muyuan Li <muyuanli@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#552972}

Bug: None
Change-Id: Ibbd692cbde43012504d3790a9be8e7911be87149
Reviewed-on: https://chromium-review.googlesource.com/1026256Reviewed-by: Muyuan Li <muyuanli@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553275}

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -84,21 +84,22 @@ void AssistantManagerServiceImpl::SendGetSettingsUiRequest(
     const std::string& selector,
     GetSettingsUiResponseCallback callback) {
   std::string serialized_proto = SerializeGetSettingsUiRequest(selector);
-  assistant_manager_internal_->SendGetSettingsUiRequest(serialized_proto, [
-    callback, weak_ptr = weak_factory_.GetWeakPtr(),
-    task_runner = main_thread_task_runner_
-  ](const assistant_client::VoicelessResponse& response) {
-    // This callback may be called from server multiple times. We should only
-    // process non-empty response.
-    std::string settings = UnwrapGetSettingsUiResponse(response);
-    if (!settings.empty()) {
-      task_runner->PostTask(
-          FROM_HERE,
-          base::BindOnce(
-              &AssistantManagerServiceImpl::HandleGetSettingsResponse,
-              std::move(weak_ptr), callback, settings));
-    }
-  });
+  assistant_manager_internal_->SendGetSettingsUiRequest(
+      serialized_proto, std::string(), [
+        callback, weak_ptr = weak_factory_.GetWeakPtr(),
+        task_runner = main_thread_task_runner_
+      ](const assistant_client::VoicelessResponse& response) {
+        // This callback may be called from server multiple times. We should
+        // only process non-empty response.
+        std::string settings = UnwrapGetSettingsUiResponse(response);
+        if (!settings.empty()) {
+          task_runner->PostTask(
+              FROM_HERE,
+              base::BindOnce(
+                  &AssistantManagerServiceImpl::HandleGetSettingsResponse,
+                  std::move(weak_ptr), callback, settings));
+        }
+      });
 }
 
 void AssistantManagerServiceImpl::SendTextQuery(const std::string& query) {

chromeos/services/assistant/platform/audio_input_provider_impl.cc

@@ -20,40 +20,6 @@ constexpr assistant_client::BufferFormat kFormat{
 
 }  // namespace
 
-AudioInputConfigImpl::AudioInputConfigImpl() = default;
-
-AudioInputConfigImpl::~AudioInputConfigImpl() = default;
-
-std::vector<int> AudioInputConfigImpl::GetSelectedChannels() const {
-  return std::vector<int>{};
-}
-
-float AudioInputConfigImpl::GetMicSensitivity() const {
-  return 0.f;
-}
-
-assistant_client::AudioInputConfig::InputType
-AudioInputConfigImpl::GetInputType() const {
-  return assistant_client::AudioInputConfig::MICROPHONE_NEAR_FIELD;
-}
-
-std::string AudioInputConfigImpl::GetMicManufacturer() const {
-  return "default";
-}
-
-std::string AudioInputConfigImpl::GetMicModel() const {
-  return "default";
-}
-
-std::string AudioInputConfigImpl::GetMicVersion() const {
-  return "0";
-}
-
-assistant_client::AudioInputConfig::MicState AudioInputConfigImpl::GetMicState()
-    const {
-  return assistant_client::AudioInputConfig::ENABLED;
-}
-
 class AudioInputBufferImpl : public assistant_client::AudioBuffer {
  public:
   AudioInputBufferImpl(const void* data, uint32_t frame_count)
@@ -124,11 +90,6 @@ AudioInputProviderImpl::AudioInputProviderImpl(mojom::AudioInputPtr audio_input)
 
 AudioInputProviderImpl::~AudioInputProviderImpl() = default;
 
-assistant_client::AudioInputConfig&
-AudioInputProviderImpl::GetAudioInputConfig() {
-  return audio_input_config_;
-}
-
 assistant_client::AudioInput& AudioInputProviderImpl::GetAudioInput() {
   return audio_input_;
 }

chromeos/services/assistant/platform/audio_input_provider_impl.h

@@ -18,26 +18,6 @@
 namespace chromeos {
 namespace assistant {
 
-// TODO(muyuanli): This class is currently a stub. It will need to be wired up
-// to use the real HW parameters.
-class AudioInputConfigImpl : public assistant_client::AudioInputConfig {
- public:
-  AudioInputConfigImpl();
-  ~AudioInputConfigImpl() override;
-
-  // assistant_client::AudioInputConfigImpl overrides:
-  std::vector<int> GetSelectedChannels() const override;
-  float GetMicSensitivity() const override;
-  assistant_client::AudioInputConfig::InputType GetInputType() const override;
-  std::string GetMicManufacturer() const override;
-  std::string GetMicModel() const override;
-  std::string GetMicVersion() const override;
-  assistant_client::AudioInputConfig::MicState GetMicState() const override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AudioInputConfigImpl);
-};
-
 class AudioInputImpl : public assistant_client::AudioInput,
                        public mojom::AudioInputObserver {
  public:
@@ -71,14 +51,10 @@ class AudioInputProviderImpl : public assistant_client::AudioInputProvider {
   ~AudioInputProviderImpl() override;
 
   // assistant_client::AudioInputProvider overrides:
-  assistant_client::AudioInputConfig& GetAudioInputConfig() override;
   assistant_client::AudioInput& GetAudioInput() override;
-  // Assumes no config would change.
-  void RegisterConfigChangeCallback(ConfigChangeCallback callback) override {}
   int64_t GetCurrentAudioTime() override;
 
  private:
-  AudioInputConfigImpl audio_input_config_;
   AudioInputImpl audio_input_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputProviderImpl);

chromeos/services/assistant/platform/system_provider_impl.cc

@@ -13,50 +13,29 @@
 namespace chromeos {
 namespace assistant {
 
-SystemProviderImpl::SystemProviderImpl()
-    : board_name_(base::SysInfo::GetLsbReleaseBoard()),
-      device_model_id_(base::StringPrintf("cros-%s", board_name_.c_str())) {
-  embedder_build_info_ = chromeos::version_loader::GetVersion(
-      chromeos::version_loader::VERSION_FULL);
-}
+SystemProviderImpl::SystemProviderImpl() = default;
 
 SystemProviderImpl::~SystemProviderImpl() = default;
 
-std::string SystemProviderImpl::GetDeviceModelId() {
-  return device_model_id_;
-}
-
-int SystemProviderImpl::GetDeviceModelRevision() {
-  return 0;
-}
-
-std::string SystemProviderImpl::GetEmbedderBuildInfo() {
-  return embedder_build_info_;
-}
-
-std::string SystemProviderImpl::GetBoardName() {
-  return board_name_;
-}
-
-std::string SystemProviderImpl::GetBoardRevision() {
-  return "0";
+assistant_client::MicMuteState SystemProviderImpl::GetMicMuteState() {
+  // TODO(xiaohuic): implement mic mute state.
+  return assistant_client::MicMuteState::MICROPHONE_ENABLED;
 }
 
-int SystemProviderImpl::GetDebugServerPort() {
-#if DCHECK_IS_ON()
-  return 8007;
-#else   // DCHECK_IS_ON()
-  // -1 disables debug server.
-  return -1;
-#endif  // DCHECK_IS_ON()
+void SystemProviderImpl::RegisterMicMuteChangeCallback(
+    ConfigChangeCallback callback) {
+  // TODO(xiaohuic): implement mic mute state.
 }
 
-std::string SystemProviderImpl::GetOemDeviceId() {
-  return board_name_;
+assistant_client::PowerManagerProvider*
+SystemProviderImpl::GetPowerManagerProvider() {
+  // TODO(xiaohuic): implement power manager provider
+  return nullptr;
 }
 
-std::string SystemProviderImpl::GetDisplayName() {
-  return board_name_;
+bool SystemProviderImpl::GetBatteryState(BatteryState* state) {
+  // TODO(xiaohuic): implement battery state
+  return false;
 }
 
 }  // namespace assistant

chromeos/services/assistant/platform/system_provider_impl.h

@@ -19,20 +19,12 @@ class SystemProviderImpl : public assistant_client::SystemProvider {
   ~SystemProviderImpl() override;
 
   // assistant_client::SystemProvider implementation:
-  std::string GetDeviceModelId() override;
-  int GetDeviceModelRevision() override;
-  std::string GetEmbedderBuildInfo() override;
-  std::string GetBoardName() override;
-  std::string GetBoardRevision() override;
-  std::string GetOemDeviceId() override;
-  std::string GetDisplayName() override;
-  int GetDebugServerPort() override;
+  assistant_client::MicMuteState GetMicMuteState() override;
+  void RegisterMicMuteChangeCallback(ConfigChangeCallback callback) override;
+  assistant_client::PowerManagerProvider* GetPowerManagerProvider() override;
+  bool GetBatteryState(BatteryState* state) override;
 
  private:
-  std::string board_name_;
-  std::string device_model_id_;
-  std::string embedder_build_info_;
-
   DISALLOW_COPY_AND_ASSIGN(SystemProviderImpl);
 };