arc: Notify ARC instance failures via callbacks.

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"
@@ skipping 23 matching lines @@
 
       case ArcBridgeService::State::STOPPED:
         message_loop_.PostTask(FROM_HERE, message_loop_.QuitWhenIdleClosure());
         break;
 
       default:
         break;
     }
   }
 
+  void OnBridgeAborting(ArcBridgeService::AbortReason reason) override {
+    aborted_ = true;
+    abort_reason_ = reason;
+  }
+
   bool ready() const { return ready_; }
   ArcBridgeService::State state() const { return state_; }
 
  protected:
   std::unique_ptr<ArcBridgeServiceImpl> service_;
   std::unique_ptr<FakeArcBridgeInstance> instance_;
+  bool aborted_;
+  ArcBridgeService::AbortReason abort_reason_;
 
  private:
   void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
 
     ready_ = false;
     state_ = ArcBridgeService::State::STOPPED;
+    aborted_ = false;
+    abort_reason_ = ArcBridgeService::AbortReason::GENERIC_BOOT_FAILURE;
 
     instance_.reset(new FakeArcBridgeInstance());
     service_.reset(new ArcBridgeServiceImpl(
         base::MakeUnique<FakeArcBridgeBootstrap>(instance_.get())));
 
     service_->AddObserver(this);
   }
 
   void TearDown() override {
     service_->RemoveObserver(this);
@@ skipping 66 matching lines @@
   ASSERT_EQ(1, instance_->init_calls());
 
   // Simulate a connection loss.
   service_->DisableReconnectDelayForTesting();
   service_->OnChannelClosed();
   instance_->SimulateCrash();
   instance_->WaitForInitCall();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
   ASSERT_EQ(2, instance_->init_calls());
 
+  ASSERT_TRUE(aborted_);
+  ASSERT_EQ(ArcBridgeService::AbortReason::CRASH, abort_reason_);

[hidehiko, 2016/07/11 05:40:08]

Could you add GENERIC_BOOT_FAILURE case, too?

[Shuhei Takahashi, 2016/07/11 08:25:19]

Done.

+
   service_->Shutdown();
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
 // Removing the same observer more than once should be okay.
 TEST_F(ArcBridgeTest, RemoveObserverTwice) {
   ASSERT_FALSE(ready());
   service_->RemoveObserver(this);
   // The teardown method will also remove |this|.
 }
 
 // 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