Makes the BattOrConnection read messages instead of bytes

tools/battor_agent/battor_connection.h

 // 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.
 
 #ifndef TOOLS_BATTOR_AGENT_BATTOR_CONNECTION_H_
 #define TOOLS_BATTOR_AGENT_BATTOR_CONNECTION_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 //
 // For a more in-depth description of the protocol, see http://bit.ly/1NvNVc3.
 class BattOrConnection {
  public:
   // The listener interface that must be implemented in order to interact with
   // the BattOrConnection.
   class Listener {
    public:
     virtual void OnConnectionOpened(bool success) = 0;
     virtual void OnBytesSent(bool success) = 0;
-    virtual void OnBytesRead(bool success,
-                             BattOrMessageType type,
-                             scoped_ptr<std::vector<char>> bytes) = 0;
+    virtual void OnMessageRead(bool success,
+                               BattOrMessageType type,
+                               scoped_ptr<std::vector<char>> bytes) = 0;
   };
 
   BattOrConnection(Listener* listener);
   virtual ~BattOrConnection() = 0;
 
   // Initializes the serial connection and calls the listener's
   // OnConnectionOpened() when complete. This function must be called before
   // using the BattOrConnection. If the connection is already open, calling this
   // method immediately calls the listener's OnConnectionOpened method.
   virtual void Open() = 0;
   // Closes the serial connection and releases any handles being held.
   virtual void Close() = 0;
 
   // Sends the specified buffer over the serial connection and calls the
   // listener's OnBytesSent() when complete. Note that bytes_to_send should not
   // include the start, end, type, or escape bytes required by the BattOr
   // protocol.
   virtual void SendBytes(BattOrMessageType type,
                          const void* buffer,
                          size_t bytes_to_send) = 0;
 
-  // Reads the specified number of bytes from the serial connection and calls
-  // the listener's OnBytesRead() when complete. Note that the number of bytes
-  // requested should not include the start, end, or type bytes required by the
-  // BattOr protocol, and that this method may issue multiple read read requests
-  // if the message contains escape characters.
-  virtual void ReadBytes(size_t bytes_to_read) = 0;
+  // Gets the next message available from the serial connection, reading the
+  // correct number of bytes based on the specified message type, and calls the
+  // listener's OnMessageRead() when complete.
+  virtual void ReadMessage(BattOrMessageType type) = 0;
 
   // Flushes the serial connection to the BattOr.
   virtual void Flush() = 0;
 
  protected:
   // The listener receiving the results of the commands being executed.
   Listener* listener_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BattOrConnection);
 };
 
 }  // namespace battor
 
 #endif  // TOOLS_BATTOR_AGENT_BATTOR_CONNECTION_H_