More graceful shutdown for ArcSession.

components/arc/arc_bridge_service_impl.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 "components/arc/arc_bridge_service_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "components/prefs/pref_service.h"
 
 namespace arc {
 
 extern ArcBridgeService* g_arc_bridge_service;
 
 namespace {
 constexpr int64_t kReconnectDelayInSeconds = 5;
 }  // namespace
 
-ArcBridgeServiceImpl::ArcBridgeServiceImpl()
+ArcBridgeServiceImpl::ArcBridgeServiceImpl(
+    const scoped_refptr<base::TaskRunner>& blocking_task_runner)
     : session_started_(false),
-      factory_(base::Bind(ArcSession::Create)),
+      factory_(base::Bind(ArcSession::Create, blocking_task_runner)),
       weak_factory_(this) {
   DCHECK(!g_arc_bridge_service);
   g_arc_bridge_service = this;
 }
 
 ArcBridgeServiceImpl::~ArcBridgeServiceImpl() {
   if (arc_session_)
     arc_session_->RemoveObserver(this);
 
   DCHECK(g_arc_bridge_service == this);
   g_arc_bridge_service = nullptr;
 }
 
-void ArcBridgeServiceImpl::HandleStartup() {
+void ArcBridgeServiceImpl::RequestStart() {
   DCHECK(CalledOnValidThread());
   if (session_started_)
     return;
   VLOG(1) << "Session started";
   session_started_ = true;
   PrerequisitesChanged();
 }
 
-void ArcBridgeServiceImpl::Shutdown() {
+void ArcBridgeServiceImpl::RequestStop() {
   DCHECK(CalledOnValidThread());
   if (!session_started_)
     return;
   VLOG(1) << "Session ended";
   session_started_ = false;
   PrerequisitesChanged();
 }
 
+void ArcBridgeServiceImpl::OnShutdown() {
+  DCHECK(CalledOnValidThread());
+  VLOG(1) << "OnShutdown";
+  if (!session_started_)
+    return;
+  session_started_ = false;
+  reconnect_ = false;
+  if (arc_session_)
+    arc_session_->OnShutdown();
+}
+
 void ArcBridgeServiceImpl::SetArcSessionFactoryForTesting(
     const ArcSessionFactory& factory) {
   DCHECK(!factory.is_null());
   factory_ = factory;
 }
 
-
 void ArcBridgeServiceImpl::DisableReconnectDelayForTesting() {
   use_delay_before_reconnecting_ = false;
 }
 
 void ArcBridgeServiceImpl::PrerequisitesChanged() {
   DCHECK(CalledOnValidThread());
   VLOG(1) << "Prerequisites changed. "
           << "state=" << static_cast<uint32_t>(state())
           << ", session_started=" << session_started_;
   if (state() == State::STOPPED) {
@@ skipping 71 matching lines @@
                                 weak_factory_.GetWeakPtr()),
           base::TimeDelta::FromSeconds(kReconnectDelayInSeconds));
     } else {
       // Restart immediately.
       PrerequisitesChanged();
     }
   }
 }
 
 }  // namespace arc