Fix ArcBridgeBootstrap race issues.

components/arc/arc_bridge_service_impl.h

 // Copyright 2015 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_SERVICE_IMPL_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/scoped_file.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "components/arc/arc_bridge_bootstrap.h"
 #include "components/arc/arc_bridge_service.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SequencedTaskRunner;
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace arc {
 
 // Real IPC based ArcBridgeService that is used in production.
 class ArcBridgeServiceImpl : public ArcBridgeService,
                              public ArcBridgeBootstrap::Delegate {
  public:
-  explicit ArcBridgeServiceImpl(std::unique_ptr<ArcBridgeBootstrap> bootstrap);
+  // This is the delegate interface for testing purpose only.
+  class Delegate {

[Luis Héctor Chávez, 2016/09/07 23:38:32]

Wouldn't this make more sense to be called "Factory" and be in
ArcBridgeBootstrap?

[hidehiko, 2016/09/08 16:53:41]

Replaced by Factory style with base::Callback.
Can we keep the factory in this class? The factory is only for testing with
ArcBridgeServiceImpl so that it should be independent from ArcBridgeBootstrap?

[Luis Héctor Chávez, 2016/09/15 23:08:49]

Sure, after the refactor and in callback-style it makes more sense to have it
here.

+   public:
+    // Creates ArcBridgeBootstrap instance.
+    virtual std::unique_ptr<ArcBridgeBootstrap> CreateBootstrap() = 0;

[Luis Héctor Chávez, 2016/09/07 23:38:32]

this needs a virtual destructor.

[hidehiko, 2016/09/08 16:53:41]

Acknowledged.

+  };
+
+  ArcBridgeServiceImpl();
   ~ArcBridgeServiceImpl() override;
 
   void HandleStartup() override;
 
   void Shutdown() override;
 
+  // |delegate| is managed by the caller. This is only for testing purpose.
+  void SetDelegateForTesting(Delegate* delegate) { delegate_ = delegate; }
+
   // Normally, reconnecting after connection shutdown happens after a short
   // delay. When testing, however, we'd like it to happen immediately to avoid
   // adding unnecessary delays.
   void DisableReconnectDelayForTesting();
 
  private:
   friend class ArcBridgeTest;
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, OnBridgeStopped);
 
@@ skipping 18 matching lines @@
   // TODO(hidehiko): Move this to ArcBridgeBootstrap.
   std::unique_ptr<mojom::ArcBridgeHost> arc_bridge_host_;
 
   // If the instance had already been started but the connection to it was
   // lost. This should make the instance restart.
   bool reconnect_ = false;
 
   // Delay the reconnection.
   bool use_delay_before_reconnecting_ = true;
 
+  // Delegate to inject a fake ArcBridgeBootstrap instance for testing.
+  Delegate* delegate_ = nullptr;

[Luis Héctor Chávez, 2016/09/07 23:38:32]

If you make the Delegate a Factory, maybe make this a std::unique_ptr<Factory>.
That way we can remove the ArcBridgeBootstrap::Create and instead instantiate an
ArcBridgeBootstrap::Factory() as the default value for this. In tests, instead
of passing "this" as the factory, it's probably better to replace it with a
FakeArcBridgeBootstrap::Factory().

[hidehiko, 2016/09/08 16:53:41]

Replaced by Callback, and now life-time should be managed as value.

+
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeServiceImpl);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_IMPL_H_