Do nothing on OnSessionStopped if ARC is being restarted.

components/arc/arc_session_runner.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_session_runner.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
-#include "components/arc/arc_session.h"
 
 namespace arc {
 
 namespace {
 
 constexpr base::TimeDelta kDefaultRestartDelay =
     base::TimeDelta::FromSeconds(5);
 
 }  // namespace
 
 ArcSessionRunner::ArcSessionRunner(const ArcSessionFactory& factory)
     : restart_delay_(kDefaultRestartDelay),
       factory_(factory),
       weak_ptr_factory_(this) {}
 
 ArcSessionRunner::~ArcSessionRunner() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (arc_session_)
     arc_session_->RemoveObserver(this);
 }
 
-void ArcSessionRunner::AddObserver(ArcSessionObserver* observer) {
+void ArcSessionRunner::AddObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observer_list_.AddObserver(observer);
 }
 
-void ArcSessionRunner::RemoveObserver(ArcSessionObserver* observer) {
+void ArcSessionRunner::RemoveObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observer_list_.RemoveObserver(observer);
 }
 
 void ArcSessionRunner::RequestStart() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Consecutive RequestStart() call. Do nothing.
   if (run_requested_)
     return;
@@ skipping 96 matching lines @@
 }
 
 void ArcSessionRunner::OnSessionReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, State::STARTING);
   DCHECK(arc_session_);
   DCHECK(!restart_timer_.IsRunning());
 
   VLOG(0) << "ARC ready";
   state_ = State::RUNNING;
-
-  for (auto& observer : observer_list_)
-    observer.OnSessionReady();
 }
 
-void ArcSessionRunner::OnSessionStopped(StopReason stop_reason) {
+void ArcSessionRunner::OnSessionStopped(ArcStopReason stop_reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(state_, State::STOPPED);
   DCHECK(arc_session_);
   DCHECK(!restart_timer_.IsRunning());
 
   VLOG(0) << "ARC stopped: " << stop_reason;
   arc_session_->RemoveObserver(this);
   arc_session_.reset();
 
   // If RUNNING, ARC instance unexpectedly crashed so we need to restart it
   // automatically.
   // If STOPPING, at least once RequestStop() is called. If |session_started_|
   // is true, RequestStart() is following so schedule to restart ARC session.
   // Otherwise, do nothing.
   // If STARTING, ARC instance has not been booted properly, so do not
   // restart it automatically.
+  bool restarting = false;

[Luis Héctor Chávez, 2017/03/01 18:26:53]

maybe make this

const bool restarting = (state == State::RUNNING || ...);
if (restarting) {
  ...
}

[hidehiko, 2017/03/01 18:43:02]

Done.

   if (state_ == State::RUNNING ||
       (state_ == State::STOPPING && run_requested_)) {
     // This check is for RUNNING case. In RUNNING case |run_requested_| should
     // be always true, because if once RequestStop() is called, the state_
     // will be set to STOPPING.
     DCHECK(run_requested_);
 
     // There was a previous invocation and it crashed for some reason. Try
     // starting ARC instance later again.
     // Note that even |restart_delay_| is 0 (for testing), it needs to
     // PostTask, because observer callback may call RequestStart()/Stop().
     VLOG(0) << "ARC restarting";
     restart_timer_.Start(FROM_HERE, restart_delay_,
                          base::Bind(&ArcSessionRunner::StartArcSession,
                                     weak_ptr_factory_.GetWeakPtr()));
+    restarting = true;
   }
 
-  // TODO(hidehiko): Consider to let observers know whether there is scheduled
-  // restarting event, or not.
   state_ = State::STOPPED;
   for (auto& observer : observer_list_)
-    observer.OnSessionStopped(stop_reason);
+    observer.OnSessionStopped(stop_reason, restarting);
 }
 
 }  // namespace arc