Revert of Creates a BattOrConnection for communicating with the BattOr

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..
 
 #include <iostream>
@@ skipping 31 matching lines @@
 
 void PrintSupportsExplicitClockSync() {
   std::cout << battor::BattOrAgent::SupportsExplicitClockSync() << endl;
 }
 
 // Retrieves argument argnum from the argument list, printing the usage
 // guidelines and exiting with an error code if the argument doesn't exist.
 std::string GetArg(int argnum, int argc, char* argv[]) {
   if (argnum >= argc) {
     PrintUsage();
-    exit(1);
+    PLOG(FATAL);
   }
 
   return argv[argnum];
 }
 
 // Checks if an error occurred and, if it did, prints the error and exits
 // with an error code.
 void CheckError(battor::BattOrError error) {
-  if (error != battor::BATTOR_ERROR_NONE)
-    LOG(FATAL) << "Fatal error when communicating with the BattOr: " << error;
+  if (error != battor::BATTOR_ERROR_NONE) {
+    LOG(ERROR) << "Fatal error when communicating with the BattOr: " << error;
+    PLOG(FATAL);
+  }
 }
 
 // Prints an error message and exits due to a required thread failing to start.
 void ExitFromThreadStartFailure(const std::string& thread_name) {
-  LOG(FATAL) << "Failed to start " << thread_name;
+  LOG(ERROR) << "Failed to start " << thread_name;
+  PLOG(FATAL);
 }
 
 }  // namespace
 
 namespace battor {
 
 // Wrapper class containing all state necessary for an independent binary to
 // use a BattOrAgent to communicate with a BattOr.
 class BattOrAgentBin : public BattOrAgent::Listener {
  public:
   BattOrAgentBin()
       : done_(false, false),
         io_thread_(kIoThreadName),
         file_thread_(kFileThreadName),
         ui_thread_(kUiThreadName) {}
 
-  ~BattOrAgentBin() { DCHECK(!agent_); }
+  ~BattOrAgentBin() {
+    DCHECK(!agent_);
+  }
 
   // Runs the BattOr binary and returns the exit code.
   int Run(int argc, char* argv[]) {
     std::string cmd = GetArg(1, argc, argv);
 
     // SupportsExplicitClockSync doesn't need to use the serial connection, so
     // handle it separately.
     if (cmd == "SupportsExplicitClockSync") {
       PrintSupportsExplicitClockSync();
       return 0;
@@ skipping 111 matching lines @@
   scoped_ptr<BattOrAgent> agent_;
 };
 
 }  // namespace battor
 
 int main(int argc, char* argv[]) {
   base::AtExitManager exit_manager;
   battor::BattOrAgentBin bin;
   return bin.Run(argc, argv);
 }