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 factory interface to inject ArcBridgeBootstrap instance
+  // for testing purpose.
+  using ArcBridgeBootstrapFactory =
+      base::Callback<std::unique_ptr<ArcBridgeBootstrap>()>;
+
+  ArcBridgeServiceImpl();
   ~ArcBridgeServiceImpl() override;
 
   void HandleStartup() override;
 
   void Shutdown() override;
 
+  // Inject a factory to create ArcBridgeBootstrap instance for testing
+  // purpose. |factory| must not be null.
+  void SetArcBridgeBootstrapFactoryForTesting(
+      const ArcBridgeBootstrapFactory& factory) {
+    factory_ = factory;

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

nit: maybe add a DCHECK(!factory.is_null()) to enforce the comment.

[hidehiko, 2016/09/26 14:31:49]

Done. Moved to .cc.

+  }
+
+  // Returns the current bootstrap instance for testing purpose.
+  ArcBridgeBootstrap* GetBootstrapForTesting() { return bootstrap_.get(); }
+
   // 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;
 
+  // Factory to inject a fake ArcBridgeBootstrap instance for testing.
+  ArcBridgeBootstrapFactory factory_;
+
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeServiceImpl);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_IMPL_H_