Refactor ArcSessionRunner part 2.

components/arc/arc_session_runner_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 <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
@@ skipping 62 matching lines @@
   static std::unique_ptr<ArcSession> CreateBootFailureArcSession(
       StopReason reason) {
     auto arc_session = base::MakeUnique<FakeArcSession>();
     arc_session->EnableBootFailureEmulation(reason);
     return std::move(arc_session);
   }
 
  private:
   // ArcSessionObserver:
   void OnSessionStopped(StopReason stop_reason) override {
-    // The instance is already destructed in ArcSessionRunner::OnStopped().
+    // The instance is already destructed in
+    // ArcSessionRunner::OnSessionStopped().
     stop_reason_ = stop_reason;
   }
 
   StopReason stop_reason_;
   std::unique_ptr<ArcSessionRunner> arc_session_runner_;
   base::MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSessionRunnerTest);
 };
 
@@ skipping 21 matching lines @@
   };
 
   Observer observer;
   arc_session_runner()->AddObserver(&observer);
   base::ScopedClosureRunner teardown(base::Bind(
       [](ArcSessionRunner* arc_session_runner, Observer* observer) {
         arc_session_runner->RemoveObserver(observer);
       },
       arc_session_runner(), &observer));
 
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
   EXPECT_TRUE(observer.IsReadyCalled());
 
   arc_session_runner()->RequestStop();
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
   EXPECT_TRUE(observer.IsStoppedCalled());
   arc_session_runner()->RemoveObserver(&observer);
 }
 
 // If the ArcSessionRunner accepts a request to stop ARC instance, it should
 // stop it, even mid-startup.
 TEST_F(ArcSessionRunnerTest, StopMidStartup) {
   ResetArcSessionFactory(
       base::Bind(&ArcSessionRunnerTest::CreateSuspendedArcSession));
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
-  EXPECT_FALSE(arc_session_runner()->stopped());
-  EXPECT_FALSE(arc_session_runner()->ready());
+  EXPECT_FALSE(arc_session_runner()->IsStopped());
+  EXPECT_FALSE(arc_session_runner()->IsRunning());
 
   arc_session_runner()->RequestStop();
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 }
 
 // If the boot procedure is failed, then restarting mechanism should not
 // triggered.
 TEST_F(ArcSessionRunnerTest, BootFailure) {
   ResetArcSessionFactory(
       base::Bind(&ArcSessionRunnerTest::CreateBootFailureArcSession,
                  StopReason::GENERIC_BOOT_FAILURE));
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
   EXPECT_EQ(StopReason::GENERIC_BOOT_FAILURE, stop_reason());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 }
 
 // If the instance is stopped, it should be re-started.
 TEST_F(ArcSessionRunnerTest, Restart) {
   arc_session_runner()->SetRestartDelayForTesting(base::TimeDelta());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   // Simulate a connection loss.
   ASSERT_TRUE(arc_session());
   arc_session()->StopWithReason(StopReason::CRASH);
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   arc_session_runner()->RequestStop();
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 }
 
 // Makes sure OnSessionStopped is called on stop.
 TEST_F(ArcSessionRunnerTest, OnSessionStopped) {
   arc_session_runner()->SetRestartDelayForTesting(base::TimeDelta());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   // 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_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   // Simulate crash.
   ASSERT_TRUE(arc_session());
   arc_session()->StopWithReason(StopReason::CRASH);
   EXPECT_EQ(StopReason::CRASH, stop_reason());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   // Graceful stop.
   arc_session_runner()->RequestStop();
   EXPECT_EQ(StopReason::SHUTDOWN, stop_reason());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 }
 
 TEST_F(ArcSessionRunnerTest, Shutdown) {
   arc_session_runner()->SetRestartDelayForTesting(base::TimeDelta());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   arc_session_runner()->RequestStart();
-  EXPECT_TRUE(arc_session_runner()->ready());
+  EXPECT_TRUE(arc_session_runner()->IsRunning());
 
   // Simulate shutdown.
   arc_session_runner()->OnShutdown();
   EXPECT_EQ(StopReason::SHUTDOWN, stop_reason());
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 }
 
 // Removing the same observer more than once should be okay.
 TEST_F(ArcSessionRunnerTest, RemoveObserverTwice) {
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   DummyObserver dummy_observer;
   arc_session_runner()->AddObserver(&dummy_observer);
   // Call RemoveObserver() twice.
   arc_session_runner()->RemoveObserver(&dummy_observer);
   arc_session_runner()->RemoveObserver(&dummy_observer);
 }
 
 // Removing an unknown observer should be allowed.
 TEST_F(ArcSessionRunnerTest, RemoveUnknownObserver) {
-  EXPECT_TRUE(arc_session_runner()->stopped());
+  EXPECT_TRUE(arc_session_runner()->IsStopped());
 
   DummyObserver dummy_observer;
   arc_session_runner()->RemoveObserver(&dummy_observer);
 }
 
 }  // namespace arc