Refactor ArcBridgeServiceImpl part 1.

components/arc/arc_bridge_service_unittest.cc

 // 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.
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
@@ skipping 137 matching lines @@
                  StopReason::GENERIC_BOOT_FAILURE));
   EXPECT_TRUE(arc_bridge_service()->stopped());
 
   arc_bridge_service()->RequestStart();
   EXPECT_EQ(StopReason::GENERIC_BOOT_FAILURE, stop_reason());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 }
 
 // If the instance is stopped, it should be re-started.
 TEST_F(ArcBridgeTest, Restart) {
-  arc_bridge_service()->DisableReconnectDelayForTesting();
+  arc_bridge_service()->SetRestartDelayForTesting(base::TimeDelta());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 
   arc_bridge_service()->RequestStart();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   // Simulate a connection loss.
   ASSERT_TRUE(arc_session());
   arc_session()->StopWithReason(StopReason::CRASH);
+  EXPECT_TRUE(arc_bridge_service()->stopped());
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   arc_bridge_service()->RequestStop();
   EXPECT_TRUE(arc_bridge_service()->stopped());
 }
 
 // Makes sure OnSessionStopped is called on stop.
 TEST_F(ArcBridgeTest, OnSessionStopped) {
-  arc_bridge_service()->DisableReconnectDelayForTesting();
+  arc_bridge_service()->SetRestartDelayForTesting(base::TimeDelta());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 
   arc_bridge_service()->RequestStart();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   // Simulate boot failure.
   ASSERT_TRUE(arc_session());
   arc_session()->StopWithReason(StopReason::GENERIC_BOOT_FAILURE);
   EXPECT_EQ(StopReason::GENERIC_BOOT_FAILURE, stop_reason());
+  EXPECT_TRUE(arc_bridge_service()->stopped());
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   // Simulate crash.
   ASSERT_TRUE(arc_session());
   arc_session()->StopWithReason(StopReason::CRASH);
   EXPECT_EQ(StopReason::CRASH, stop_reason());
+  EXPECT_TRUE(arc_bridge_service()->stopped());
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   // Graceful stop.
   arc_bridge_service()->RequestStop();
   EXPECT_EQ(StopReason::SHUTDOWN, stop_reason());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 }
 
 TEST_F(ArcBridgeTest, Shutdown) {
-  arc_bridge_service()->DisableReconnectDelayForTesting();
+  arc_bridge_service()->SetRestartDelayForTesting(base::TimeDelta());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 
   arc_bridge_service()->RequestStart();
   EXPECT_TRUE(arc_bridge_service()->ready());
 
   // Simulate shutdown.
   arc_bridge_service()->OnShutdown();
   EXPECT_EQ(StopReason::SHUTDOWN, stop_reason());
   EXPECT_TRUE(arc_bridge_service()->stopped());
 }
@@ skipping 11 matching lines @@
 
 // Removing an unknown observer should be allowed.
 TEST_F(ArcBridgeTest, RemoveUnknownObserver) {
   EXPECT_TRUE(arc_bridge_service()->stopped());
 
   DummyObserver dummy_observer;
   arc_bridge_service()->RemoveObserver(&dummy_observer);
 }
 
 }  // namespace arc