Migrate ArcBridgeService::Observer and ArcSession::Observer.

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/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/test/fake_arc_session.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 
 namespace {
 
-class DummyObserver : public ArcBridgeService::Observer {};
+class DummyObserver : public ArcSessionObserver {};
 
 }  // namespace
 
 // TODO(hidehiko): ArcBridgeTest gets complicated and has stale code.
 // Simplify the code.
-class ArcBridgeTest : public testing::Test,
-                      public ArcBridgeService::Observer {
+class ArcBridgeTest : public testing::Test, public ArcSessionObserver {
  public:
   ArcBridgeTest() = default;
 
-  void OnBridgeReady() override {
+  void OnSessionReady() override {
     state_ = ArcBridgeService::State::READY;
     ready_ = true;
   }
 
-  void OnBridgeStopped(ArcBridgeService::StopReason stop_reason) override {
+  void OnSessionStopped(StopReason stop_reason) override {
     // The instance is already destructed in ArcBridgeServiceImpl::OnStopped().
     state_ = ArcBridgeService::State::STOPPED;
     stop_reason_ = stop_reason;
     message_loop_.task_runner()->PostTask(FROM_HERE,
                                           message_loop_.QuitWhenIdleClosure());
   }
 
   bool ready() const { return ready_; }
   ArcBridgeService::State state() const { return state_; }
   FakeArcSession* arc_session() const {
     return static_cast<FakeArcSession*>(service_->GetArcSessionForTesting());
   }
 
  protected:
   std::unique_ptr<ArcBridgeServiceImpl> service_;
-  ArcBridgeService::StopReason stop_reason_;
+  StopReason stop_reason_;
 
   static std::unique_ptr<ArcSession> CreateSuspendedArcSession() {
     auto arc_session = base::MakeUnique<FakeArcSession>();
     arc_session->SuspendBoot();
     return std::move(arc_session);
   }
 
   static std::unique_ptr<ArcSession> CreateBootFailureArcSession(
-      ArcBridgeService::StopReason reason) {
+      StopReason reason) {
     auto arc_session = base::MakeUnique<FakeArcSession>();
     arc_session->EnableBootFailureEmulation(reason);
     return std::move(arc_session);
   }
 
  private:
   void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
 
     ready_ = false;
     state_ = ArcBridgeService::State::STOPPED;
-    stop_reason_ = ArcBridgeService::StopReason::SHUTDOWN;
+    stop_reason_ = StopReason::SHUTDOWN;
 
     // We inject FakeArcSession here so we do not need task_runner.
     service_.reset(new ArcBridgeServiceImpl(nullptr));
     service_->SetArcSessionFactoryForTesting(
         base::Bind(FakeArcSession::Create));
     service_->AddObserver(this);
   }
 
   void TearDown() override {
     service_->RemoveObserver(this);
@@ skipping 37 matching lines @@
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // If the boot procedure is failed, then restarting mechanism should not
 // triggered.
 TEST_F(ArcBridgeTest, BootFailure) {
   ASSERT_TRUE(service_->stopped());
 
   service_->SetArcSessionFactoryForTesting(
       base::Bind(ArcBridgeTest::CreateBootFailureArcSession,
-                 ArcBridgeService::StopReason::GENERIC_BOOT_FAILURE));
+                 StopReason::GENERIC_BOOT_FAILURE));
   service_->RequestStart();
-  EXPECT_EQ(ArcBridgeService::StopReason::GENERIC_BOOT_FAILURE, stop_reason_);
+  EXPECT_EQ(StopReason::GENERIC_BOOT_FAILURE, stop_reason_);
   ASSERT_TRUE(service_->stopped());
 }
 
 // If the instance is stopped, it should be re-started.
 TEST_F(ArcBridgeTest, Restart) {
   ASSERT_FALSE(ready());
 
   service_->RequestStart();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
 
   // Simulate a connection loss.
   service_->DisableReconnectDelayForTesting();
   ASSERT_TRUE(arc_session());
-  arc_session()->StopWithReason(ArcBridgeService::StopReason::CRASH);
+  arc_session()->StopWithReason(StopReason::CRASH);
   ASSERT_TRUE(service_->ready());
 
   service_->RequestStop();
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // Makes sure OnBridgeStopped is called on stop.
 TEST_F(ArcBridgeTest, OnBridgeStopped) {
   ASSERT_FALSE(ready());
 
   service_->DisableReconnectDelayForTesting();
   service_->RequestStart();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
 
   // Simulate boot failure.
   ASSERT_TRUE(arc_session());
-  arc_session()->StopWithReason(
-      ArcBridgeService::StopReason::GENERIC_BOOT_FAILURE);
-  EXPECT_EQ(ArcBridgeService::StopReason::GENERIC_BOOT_FAILURE, stop_reason_);
+  arc_session()->StopWithReason(StopReason::GENERIC_BOOT_FAILURE);
+  EXPECT_EQ(StopReason::GENERIC_BOOT_FAILURE, stop_reason_);
   ASSERT_TRUE(service_->ready());
 
   // Simulate crash.
   ASSERT_TRUE(arc_session());
-  arc_session()->StopWithReason(ArcBridgeService::StopReason::CRASH);
-  EXPECT_EQ(ArcBridgeService::StopReason::CRASH, stop_reason_);
+  arc_session()->StopWithReason(StopReason::CRASH);
+  EXPECT_EQ(StopReason::CRASH, stop_reason_);
   ASSERT_TRUE(service_->ready());
 
   // Graceful stop.
   service_->RequestStop();
-  ASSERT_EQ(ArcBridgeService::StopReason::SHUTDOWN, stop_reason_);
+  ASSERT_EQ(StopReason::SHUTDOWN, stop_reason_);
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 TEST_F(ArcBridgeTest, Shutdown) {
   ASSERT_FALSE(ready());
 
   service_->DisableReconnectDelayForTesting();
   service_->RequestStart();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
 
   // Simulate shutdown.
   service_->OnShutdown();
-  ASSERT_EQ(ArcBridgeService::StopReason::SHUTDOWN, stop_reason_);
+  ASSERT_EQ(StopReason::SHUTDOWN, stop_reason_);
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // Removing the same observer more than once should be okay.
 TEST_F(ArcBridgeTest, RemoveObserverTwice) {
   ASSERT_FALSE(ready());
   auto dummy_observer = base::MakeUnique<DummyObserver>();
   service_->AddObserver(dummy_observer.get());
   // Call RemoveObserver() twice.
   service_->RemoveObserver(dummy_observer.get());
   service_->RemoveObserver(dummy_observer.get());
 }
 
 // Removing an unknown observer should be allowed.
 TEST_F(ArcBridgeTest, RemoveUnknownObserver) {
   ASSERT_FALSE(ready());
   auto dummy_observer = base::MakeUnique<DummyObserver>();
   service_->RemoveObserver(dummy_observer.get());
 }
 
 }  // namespace arc