Remove explicit singletonness of ArcBridgeService part 1.

components/arc/arc_bridge_host_impl.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_ARC_ARC_BRIDGE_HOST_IMPL_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_HOST_IMPL_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "components/arc/common/arc_bridge.mojom.h"
 #include "components/arc/instance_holder.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 
 namespace arc {
 
+class ArcBridgeService;
+
 // Implementation of the ArcBridgeHost.
 // The lifetime of ArcBridgeHost and ArcBridgeInstance mojo channels are tied
 // to this instance. Also, any ARC related Mojo channel will be closed if
 // either ArcBridgeHost or ArcBridgeInstance Mojo channels is closed on error.
 // When ARC Instance (not Host) Mojo channel gets ready (= passed via
 // OnFooInstanceReady(), and the QueryVersion() gets completed), then this sets
 // the raw pointer to the ArcBridgeService so that other services can access
 // to the pointer, and resets it on channel closing.
 // Note that ArcBridgeService must be alive while ArcBridgeHostImpl is alive.
 class ArcBridgeHostImpl : public mojom::ArcBridgeHost {
  public:
   // Interface to keep the Mojo channel InterfacePtr.
   class MojoChannel;
 
-  explicit ArcBridgeHostImpl(mojom::ArcBridgeInstancePtr instance);
+  ArcBridgeHostImpl(ArcBridgeService* arc_bridge_service,
+                    mojom::ArcBridgeInstancePtr instance);
   ~ArcBridgeHostImpl() override;
 
   // ArcBridgeHost overrides.
   void OnAppInstanceReady(mojom::AppInstancePtr app_ptr) override;
   void OnAudioInstanceReady(mojom::AudioInstancePtr audio_ptr) override;
   void OnAuthInstanceReady(mojom::AuthInstancePtr auth_ptr) override;
   void OnBluetoothInstanceReady(
       mojom::BluetoothInstancePtr bluetooth_ptr) override;
   void OnBootPhaseMonitorInstanceReady(
       mojom::BootPhaseMonitorInstancePtr boot_phase_monitor_ptr) override;
@@ skipping 34 matching lines @@
   // The common implementation to handle ArcBridgeHost overrides.
   // |T| is a ARC Mojo Instance type.
   template <typename T>
   void OnInstanceReady(InstanceHolder<T>* holder, mojo::InterfacePtr<T> ptr);
 
   // Called if one of the established channels is closed.
   void OnChannelClosed(MojoChannel* channel);
 
   base::ThreadChecker thread_checker_;
 
+  // Owned by ArcServiceManager.
+  ArcBridgeService* const arc_bridge_service_;
+
   mojo::Binding<mojom::ArcBridgeHost> binding_;
   mojom::ArcBridgeInstancePtr instance_;
 
   // Put as a last member to ensure that any callback tied to the elements
   // is not invoked.
   std::vector<std::unique_ptr<MojoChannel>> mojo_channels_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeHostImpl);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_HOST_IMPL_H_