Fix logic for retrying BattOr initialization after a timeout

tools/battor_agent/battor_agent.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 "tools/battor_agent/battor_agent.h"
 
 #include <iomanip>
 
 #include "base/bind.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "tools/battor_agent/battor_connection_impl.h"
@@ skipping 527 matching lines @@
 
 void BattOrAgent::OnActionTimeout() {
   switch (last_action_) {
     case Action::READ_INIT_ACK:
       if (num_init_attempts_++ < kMaxInitAttempts) {
         // OnMessageRead() will fail and retry SEND_INIT.
         connection_->CancelReadMessage();
       } else {
         CompleteCommand(BATTOR_ERROR_TOO_MANY_INIT_RETRIES);
       }
-
       return;
 
     // TODO(crbug.com/672631): There's currently a BattOr firmware bug that's
     // causing the BattOr to reset when it's sent the START_TRACING command.
     // When the BattOr resets, it emits 0x00 to the serial connection. This 0x00
     // isn't long enough for the connection to consider it a full ack of the
     // START_TRACING command, so it continues to wait for more data. We handle
     // this case here by assuming any timeouts while waiting for the
     // StartTracing ack are related to this bug and retrying the full
     // initialization sequence.
     case Action::READ_START_TRACING_ACK:
       if (num_start_tracing_attempts_ < kMaxStartTracingAttempts) {
         // OnMessageRead() will fail and retry StartTracing.
         connection_->CancelReadMessage();
       } else {
         CompleteCommand(BATTOR_ERROR_TOO_MANY_START_TRACING_RETRIES);
       }
+      return;
 
     default:
       CompleteCommand(BATTOR_ERROR_TIMEOUT);
+      timeout_callback_.Cancel();
   }
-
-  timeout_callback_.Cancel();
 }
 
 void BattOrAgent::SendControlMessage(BattOrControlMessageType type,
                                      uint16_t param1,
                                      uint16_t param2) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   BattOrControlMessage msg{type, param1, param2};
   connection_->SendBytes(BATTOR_MESSAGE_TYPE_CONTROL, &msg, sizeof(msg));
 }
@@ skipping 69 matching lines @@
     if (clock_sync_marker != clock_sync_markers_.end())
       trace_stream << " <" << clock_sync_marker->second << ">";
 
     trace_stream << std::endl;
   }
 
   return trace_stream.str();
 }
 
 }  // namespace battor