[BattOr] Initialize BattOr before getting firmware git hash.

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 180 matching lines @@
       num_init_attempts_ = 1;
       PerformAction(Action::SEND_INIT);
       return;
     case Command::STOP_TRACING:
       PerformAction(Action::SEND_EEPROM_REQUEST);
       return;
     case Command::RECORD_CLOCK_SYNC_MARKER:
       PerformAction(Action::SEND_CURRENT_SAMPLE_REQUEST);
       return;
     case Command::GET_FIRMWARE_GIT_HASH:
-      PerformAction(Action::SEND_GIT_HASH_REQUEST);
+      num_init_attempts_ = 1;
+      PerformAction(Action::SEND_INIT);
       return;
     case Command::INVALID:
       NOTREACHED();
   }
 }
 
 void BattOrAgent::OnBytesSent(bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Return immediately if whatever action we were trying to perform already
@@ skipping 98 matching lines @@
         if (num_init_attempts_++ < kMaxInitAttempts) {
           PerformDelayedAction(Action::SEND_INIT,
               base::TimeDelta::FromMilliseconds(kInitRetryDelayMilliseconds));
         } else {
           CompleteCommand(BATTOR_ERROR_TOO_MANY_INIT_RETRIES);
         }
 
         return;
       }
 
-      PerformAction(Action::SEND_SET_GAIN);
-      return;
+      switch (command_) {
+        case Command::START_TRACING:
+          PerformAction(Action::SEND_SET_GAIN);
+          return;
+        case Command::GET_FIRMWARE_GIT_HASH:
+          PerformAction(Action::SEND_GIT_HASH_REQUEST);
+          return;
+        default:
+          CompleteCommand(BATTOR_ERROR_UNEXPECTED_MESSAGE);
+          return;
+      }
 
     case Action::READ_SET_GAIN_ACK:
       if (!IsAckOfControlCommand(type, BATTOR_CONTROL_MESSAGE_TYPE_SET_GAIN,
                                  *bytes)) {
         CompleteCommand(BATTOR_ERROR_UNEXPECTED_MESSAGE);
         return;
       }
 
       PerformAction(Action::SEND_START_TRACING);
       return;
@@ skipping 319 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