arc-bridge: Restart ARC instance on crash

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 <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 18 matching lines @@
 
   void Start() override {
     DCHECK(delegate_);
     ArcBridgeInstancePtr instance;
     instance_->Bind(mojo::GetProxy(&instance));
     delegate_->OnConnectionEstablished(std::move(instance));
   }
 
   void Stop() override {
     DCHECK(delegate_);
+    instance_->Unbind();
     delegate_->OnStopped();
   }
 
  private:
   // Owned by the caller.
   FakeArcBridgeInstance* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeArcBridgeBootstrap);
 };
 
@@ skipping 17 matching lines @@
 
       default:
         break;
     }
   }
 
   bool ready() const { return ready_; }
   ArcBridgeService::State state() const { return state_; }
 
  protected:
-  scoped_ptr<ArcBridgeService> service_;
+  scoped_ptr<ArcBridgeServiceImpl> service_;
   scoped_ptr<FakeArcBridgeInstance> instance_;
 
  private:
   void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
 
     ready_ = false;
     state_ = ArcBridgeService::State::STOPPED;
 
     ipc_support_.reset(new IPC::ScopedIPCSupport(message_loop_.task_runner()));
@@ skipping 14 matching lines @@
   }
 
   bool ready_;
   ArcBridgeService::State state_;
   scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
   base::MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeTest);
 };
 
-// Shuts down the instance reports booted.
-class ScopedShutdownWhenReady : public ArcBridgeService::Observer {
- public:
-  explicit ScopedShutdownWhenReady(ArcBridgeService* service)
-      : service_(service) {
-    service_->AddObserver(this);
-  }
-
-  ~ScopedShutdownWhenReady() override { service_->RemoveObserver(this); }
-
-  void OnStateChanged(ArcBridgeService::State state) override {
-    if (state == ArcBridgeService::State::READY) {
-      service_->Shutdown();
-    }
-  }
-
- private:
-  ArcBridgeService* service_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedShutdownWhenReady);
-};
-
 // Exercises the basic functionality of the ARC Bridge Service.  A message from
 // within the instance should cause the observer to be notified.
 TEST_F(ArcBridgeTest, Basic) {
   ASSERT_FALSE(ready());
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 
-  ScopedShutdownWhenReady shutdown(service_.get());
-
   service_->SetAvailable(true);
   service_->HandleStartup();
+  instance_->WaitForInitCall();
+  ASSERT_EQ(ArcBridgeService::State::READY, state());
 
-  ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
-
-  base::RunLoop run_loop;
-  run_loop.Run();
-
-  EXPECT_TRUE(ready());
+  service_->Shutdown();
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // If not all pre-requisites are met, the instance is not started.
 TEST_F(ArcBridgeTest, Prerequisites) {
   ASSERT_FALSE(ready());
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
   service_->SetAvailable(true);
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
   service_->SetAvailable(false);
   service_->HandleStartup();
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // If the ArcBridgeService is shut down, it should be stopped, even
 // mid-startup.
 TEST_F(ArcBridgeTest, ShutdownMidStartup) {
   ASSERT_FALSE(ready());
 
   service_->SetAvailable(true);
   service_->HandleStartup();
+  // WaitForInitCall() omitted.
+  ASSERT_EQ(ArcBridgeService::State::READY, state());
 
-  ASSERT_EQ(ArcBridgeService::State::READY, state());
   service_->Shutdown();
-  // Some machines can reach the STOPPED state immediately.
-  ASSERT_TRUE(state() == ArcBridgeService::State::STOPPING ||
-              state() == ArcBridgeService::State::STOPPED);
-
-  base::RunLoop run_loop;
-  run_loop.Run();
-
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
+// If the channel is disconnected, it should be re-established.
+TEST_F(ArcBridgeTest, Restart) {
+  ASSERT_FALSE(ready());
+  ASSERT_EQ(0, instance_->init_calls());
+
+  service_->SetAvailable(true);
+  service_->HandleStartup();
+  instance_->WaitForInitCall();
+  ASSERT_EQ(ArcBridgeService::State::READY, state());
+  ASSERT_EQ(1, instance_->init_calls());
+
+  // Simulate a connection loss.
+  service_->OnChannelClosed();
+  instance_->WaitForInitCall();
+  ASSERT_EQ(ArcBridgeService::State::READY, state());
+  ASSERT_EQ(2, instance_->init_calls());
+
+  service_->Shutdown();
+  ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
+}
+
 }  // namespace arc