[BattOr] Make BattOr able to return firmware version.

tools/battor_agent/battor_agent_bin.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.
 
 // This file provides a thin binary wrapper around the BattOr Agent
 // library. This binary wrapper provides a means for non-C++ tracing
 // controllers, such as Telemetry and Android Systrace, to issue high-level
 // tracing commands to the BattOr through an interactive shell.
 //
 // Example usage of how an external trace controller might use this binary:
@@ skipping 56 matching lines @@
     "\n"
     "Switches: \n"
     "  --battor-path=<path> Uses the specified BattOr path.\n"
     "\n"
     "Once in the shell, you can issue the following commands:\n"
     "\n"
     "  StartTracing\n"
     "  StopTracing <optional file path>\n"
     "  SupportsExplicitClockSync\n"
     "  RecordClockSyncMarker <marker>\n"
+    "  Version\n"

[rnephew (Reviews Here), 2016/10/18 22:55:24]

Since its a git hash and not version, should I change it to GitHash?

[charliea (OOO until 10-5), 2016/10/18 23:46:29]

I think "GetFirmwareGitHash" might be better, actually. "GitHash" probably
doesn't mean much to people that don't know about this binary already, whereas
"GetFirmwareGitHash" pretty accurately conveys what we're doing.

[rnephew (Reviews Here), 2016/10/19 18:23:47]

Done.

     "  Exit\n"
     "  Help\n"
     "\n";
 
 void PrintSupportsExplicitClockSync() {
   std::cout << BattOrAgent::SupportsExplicitClockSync() << endl;
 }
 
 // Logs the error and exits with an error code.
 void HandleError(battor::BattOrError error) {
@@ skipping 106 matching lines @@
     } else if (cmd.find("RecordClockSyncMarker") != std::string::npos) {
       std::vector<std::string> tokens = TokenizeString(cmd);
       if (tokens.size() != 2 || tokens[0] != "RecordClockSyncMarker") {
         std::cout << "Invalid RecordClockSyncMarker command." << endl;
         std::cout << kUsage << endl;
         PostRunNextCommand();
         return;
       }
 
       RecordClockSyncMarker(tokens[1]);
+    } else if (cmd == "Version") {
+      GetVersion();
+      PostRunNextCommand();
     } else if (cmd == "Exit" || std::cin.eof()) {
       ui_thread_message_loop_.task_runner()->PostTask(
           FROM_HERE, ui_thread_run_loop_.QuitClosure());
     } else {
       std::cout << kUsage << endl;
       PostRunNextCommand();
     }
   }
 
   void PostRunNextCommand() {
     ui_thread_message_loop_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&BattOrAgentBin::RunNextCommand, base::Unretained(this)));
   }
 
+  void GetVersion() {
+    io_thread_.task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&BattOrAgent::GetVersion, base::Unretained(agent_.get())));
+  }
+
+  void OnGetVersionComplete(const int version, BattOrError error) override {
+    if (error == BATTOR_ERROR_NONE)
+      std::cout << version << endl;
+    else
+      HandleError(error);
+
+    PostRunNextCommand();
+  }
+
   void StartTracing() {
     io_thread_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&BattOrAgent::StartTracing, base::Unretained(agent_.get())));
   }
 
   void OnStartTracingComplete(BattOrError error) override {
     if (error == BATTOR_ERROR_NONE)
       std::cout << "Done." << endl;
     else
@@ skipping 89 matching lines @@
 };
 
 }  // namespace battor
 
 int main(int argc, char* argv[]) {
   base::AtExitManager exit_manager;
   base::CommandLine::Init(argc, argv);
   battor::BattOrAgentBin bin;
   return bin.Run(argc, argv);
 }