Changed MessageReader so that it doesn't read from the socket if there are

other messages being processed. Added unittests for MessageReader.

BUG=None
TEST=Unittests

Review URL: http://codereview.chromium.org/6271004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72262 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 14 deletions

diff --git a/remoting/proto/event.proto b/remoting/proto/event.proto
index 19c734d..945d0b0 100644
--- a/remoting/proto/event.proto
+++ b/remoting/proto/event.proto
@@ -40,17 +40,3 @@ message MouseEvent {
   optional MouseButton button = 5;
   optional bool button_down = 6;
 }
-
-// Defines an event message on the event channel.
-message Event {
-  required int32 timestamp = 1;  // Client timestamp for event
-  optional bool dummy = 2;       // Is this a dummy event?
-
-  optional KeyEvent key = 3;
-  optional MouseEvent mouse = 4;
-}
-
-// Message sent in the event channel.
-message EventMessage {
-  repeated Event event = 1;
-}
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 339fd59..c52dd2d 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -22,3 +22,12 @@ message ControlMessage {
   optional BeginSessionRequest begin_session_request = 3;
   optional BeginSessionResponse begin_session_response = 4;
 }
+
+// Defines an event message on the event channel.
+message EventMessage {
+  required int32 timestamp = 1;  // Client timestamp for event
+  optional bool dummy = 2;       // Is this a dummy event?
+
+  optional KeyEvent key_event = 3;
+  optional MouseEvent mouse_event = 4;
+}