Refactor ArcBridgeServiceImpl part 1.

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/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_session_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace arc {
 
 class ArcSession;
 
 // Real IPC based ArcBridgeService that is used in production.
 class ArcBridgeServiceImpl : public ArcBridgeService,
@@ skipping 12 matching lines @@
   void RequestStop() override;
   void OnShutdown() override;
 
   // Inject a factory to create ArcSession instance for testing purpose.
   // |factory| must not be null.
   void SetArcSessionFactoryForTesting(const ArcSessionFactory& factory);
 
   // Returns the current ArcSession instance for testing purpose.
   ArcSession* GetArcSessionForTesting() { return arc_session_.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();
+  // Normally, automatic restarting happens after a short delay. When testing,
+  // however, we'd like it to happen immediately to avoid adding unnecessary
+  // delays.
+  void SetRestartDelayForTesting(const base::TimeDelta& restart_delay);
 
  private:
   // If all pre-requisites are true (ARC is available, it has been enabled, and
   // the session has started), and ARC is stopped, start ARC. If ARC is running
   // and the pre-requisites stop being true, stop ARC.
   void PrerequisitesChanged();
 
+  // Starts to run an ARC instance.
+  void StartArcSession();
+
   // Stops the running instance.
   void StopInstance();
 
   // ArcSessionObserver:
   void OnSessionReady() override;
   void OnSessionStopped(StopReason reason) override;
 
   std::unique_ptr<ArcSession> arc_session_;
 
   // If the user's session has started.
   bool session_started_;
 
-  // 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;
+  // Instead of immediately trying to restart the container, give it some time
+  // to finish tearing down in case it is still in the process of stopping.
+  base::TimeDelta restart_delay_;
+  base::OneShotTimer restart_timer_;
 
   // Factory to inject a fake ArcSession instance for testing.
   ArcSessionFactory 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_