Build fixes for upreving libassistant

Bug: b:112645619

Change-Id: I572cfdf4e58cb102666f59eb931fa95337404f69
Reviewed-on: https://chromium-review.googlesource.com/1175079Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Eyor Alemayehu <eyor@google.com>
Cr-Commit-Position: refs/heads/master@{#583881}

chromeos/services/assistant/BUILD.gn

@@ -69,7 +69,7 @@ source_set("lib") {
       "//chromeos/assistant/internal/proto/google3",
       "//libassistant/contrib/core",
       "//libassistant/contrib/platform/audio",
-      "//libassistant/shared/internal_api/c:api_wrappers_for_caller_no_chromium",
+      "//libassistant/shared/internal_api/c:api_wrappers_entrypoint",
       "//libassistant/shared/public",
       "//libassistant/shared/public:export",
       "//ui/base",

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -25,7 +25,7 @@
 #include "chromeos/services/assistant/utils.h"
 #include "libassistant/shared/internal_api/assistant_manager_delegate.h"
 #include "libassistant/shared/internal_api/assistant_manager_internal.h"
-#include "libassistant/shared/internal_api/media_manager.h"
+#include "libassistant/shared/public/media_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "url/gurl.h"
 
@@ -122,8 +122,7 @@ void AssistantManagerServiceImpl::SetAccessToken(
 
 void AssistantManagerServiceImpl::RegisterFallbackMediaHandler() {
   // Register handler for media actions.
-  auto* media_manager = assistant_manager_internal_->GetMediaManager();
-  media_manager->RegisterFallbackMediaHandler(
+  assistant_manager_internal_->RegisterFallbackMediaHandler(
       [this](std::string play_media_args_proto) {
         std::string url = GetWebUrlFromMediaArgs(play_media_args_proto);
         if (!url.empty()) {

chromeos/services/assistant/platform/system_provider_impl.cc

@@ -66,5 +66,14 @@ void SystemProviderImpl::FlushForTesting() {
   battery_monitor_.FlushForTesting();
 }
 
+void SystemProviderImpl::ProcessTpm(TpmProcessingType type,
+                                    const std::string& data,
+                                    TpmCallback on_done) {
+  // This method is used for processing data from the TPM chip. This is inorder
+  // to access secure storage. The work is currently not complete (b:111559586).
+  // The default implementation by other platforms is to call on_done for now.
+  on_done(data);
+}
+
 }  // namespace assistant
 }  // namespace chromeos

chromeos/services/assistant/platform/system_provider_impl.h

@@ -26,6 +26,9 @@ class SystemProviderImpl : public assistant_client::SystemProvider {
   bool GetBatteryState(BatteryState* state) override;
   void UpdateTimezoneAndLocale(const std::string& timezone,
                                const std::string& locale) override;
+  void ProcessTpm(TpmProcessingType type,
+                  const std::string& data,
+                  TpmCallback on_done) override;
 
  private:
   friend class SystemProviderImplTest;