Convert SystemInfo to new Mojo types

This CL converts SystemInfo{Ptr, Request} in services to the
new Mojo types.

Bug: 955171
Change-Id: Ie5d39d40751a95a20cafbddcc118d76c2090b01a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787636
Commit-Queue: Olga Sharonova <olka@chromium.org>
Reviewed-by: Olga Sharonova <olka@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697558}

services/audio/public/cpp/audio_system_to_service_adapter.cc

@@ -227,14 +227,10 @@ OnInputDeviceInfoCallback WrapGetInputDeviceInfoReply(
 AudioSystemToServiceAdapter::AudioSystemToServiceAdapter(
     std::unique_ptr<service_manager::Connector> connector,
     base::TimeDelta disconnect_timeout)
-    : connector_(std::move(connector)) {
+    : connector_(std::move(connector)),
+      disconnect_timeout_(disconnect_timeout) {
   DCHECK(connector_);
   DETACH_FROM_THREAD(thread_checker_);
-  if (disconnect_timeout > base::TimeDelta()) {
-    disconnect_timer_.emplace(
-        FROM_HERE, disconnect_timeout, this,
-        &AudioSystemToServiceAdapter::DisconnectOnTimeout);
-  }
 }
 
 AudioSystemToServiceAdapter::AudioSystemToServiceAdapter(
@@ -324,30 +320,17 @@ mojom::SystemInfo* AudioSystemToServiceAdapter::GetSystemInfo() {
   if (!system_info_) {
     TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(
         "audio", "AudioSystemToServiceAdapter bound", this);
-    connector_->BindInterface(mojom::kServiceName,
-                              mojo::MakeRequest(&system_info_));
-    system_info_.set_connection_error_handler(
+    connector_->Connect(mojom::kServiceName,
+                        system_info_.BindNewPipeAndPassReceiver());
+    system_info_.set_disconnect_handler(
         base::BindOnce(&AudioSystemToServiceAdapter::OnConnectionError,
                        base::Unretained(this)));
+    if (!disconnect_timeout_.is_zero())
+      system_info_.reset_on_idle_timeout(disconnect_timeout_);
     DCHECK(system_info_);
   }
-  if (disconnect_timer_)
-    disconnect_timer_->Reset();
-  return system_info_.get();
-}
 
-void AudioSystemToServiceAdapter::DisconnectOnTimeout() {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  if (system_info_.IsExpectingResponse()) {
-    if (disconnect_timer_)
-      disconnect_timer_->Reset();
-    TRACE_EVENT_NESTABLE_ASYNC_INSTANT0("audio", "Timeout: expecting responce",
-                                        this);
-    return;
-  }
-  TRACE_EVENT_NESTABLE_ASYNC_END1("audio", "AudioSystemToServiceAdapter bound",
-                                  this, "disconnect reason", "timeout");
-  system_info_.reset();
+  return system_info_.get();
 }
 
 void AudioSystemToServiceAdapter::OnConnectionError() {

services/audio/public/cpp/audio_system_to_service_adapter.h

@@ -13,6 +13,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/audio/audio_system.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/audio/public/mojom/system_info.mojom.h"
 
 namespace service_manager {
@@ -57,15 +58,14 @@ class AudioSystemToServiceAdapter : public media::AudioSystem {
 
  private:
   mojom::SystemInfo* GetSystemInfo();
-  void DisconnectOnTimeout();
   void OnConnectionError();
 
   // Will be bound to the thread AudioSystemToServiceAdapter is used on.
   const std::unique_ptr<service_manager::Connector> connector_;
-  mojom::SystemInfoPtr system_info_;
+  mojo::Remote<mojom::SystemInfo> system_info_;
 
   // To disconnect from the audio service when not in use.
-  base::Optional<base::DelayTimer> disconnect_timer_;
+  const base::TimeDelta disconnect_timeout_;
 
   THREAD_CHECKER(thread_checker_);
   DISALLOW_COPY_AND_ASSIGN(AudioSystemToServiceAdapter);

services/audio/public/cpp/fake_system_info.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/audio/public/mojom/system_info.mojom.h"