Remove ChromotingClientMessage

BUG=None
TEST=Remoting unittests

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

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

7 files changed, 21 insertions, 27 deletions

diff --git a/remoting/client/input_handler.cc b/remoting/client/input_handler.cc
index 68c29f8..c203f54 100644
--- a/remoting/client/input_handler.cc
+++ b/remoting/client/input_handler.cc
@@ -25,7 +25,7 @@ void InputHandler::SendKeyEvent(bool press, int keycode) {
   protocol::InputStub* stub = connection_->input_stub();
   if (stub) {
     KeyEvent* event = new KeyEvent();
-    event->set_key(keycode);
+    event->set_keycode(keycode);
     event->set_pressed(press);
 
     stub->InjectKeyEvent(event, new DeleteTask<KeyEvent>(event));
diff --git a/remoting/host/event_executor_linux.cc b/remoting/host/event_executor_linux.cc
index 5096fac..add03fc 100644
--- a/remoting/host/event_executor_linux.cc
+++ b/remoting/host/event_executor_linux.cc
@@ -292,10 +292,10 @@ bool EventExecutorLinuxPimpl::Init() {
 
 void EventExecutorLinuxPimpl::HandleKey(const KeyEvent* key_event) {
   // TODO(ajwong): This will only work for QWERTY keyboards.
-  int keysym = ChromotocolKeycodeToX11Keysym(key_event->key());
+  int keysym = ChromotocolKeycodeToX11Keysym(key_event->keycode());
 
   if (keysym == -1) {
-    LOG(WARNING) << "Ignoring unknown key: " << key_event->key();
+    LOG(WARNING) << "Ignoring unknown key: " << key_event->keycode();
     return;
   }
 
@@ -303,11 +303,11 @@ void EventExecutorLinuxPimpl::HandleKey(const KeyEvent* key_event) {
   int keycode = XKeysymToKeycode(display_, keysym);
   if (keycode == 0) {
     LOG(WARNING) << "Ignoring undefined keysym: " << keysym
-                 << " for key: " << key_event->key();
+                 << " for key: " << key_event->keycode();
     return;
   }
 
-  VLOG(3) << "Got pepper key: " << key_event->key()
+  VLOG(3) << "Got pepper key: " << key_event->keycode()
           << " sending keysym: " << keysym
           << " to keycode: " << keycode;
   XTestFakeKeyEvent(display_, keycode, key_event->pressed(), CurrentTime);
diff --git a/remoting/host/event_executor_win.cc b/remoting/host/event_executor_win.cc
index 1fe3beb..4c92816 100644
--- a/remoting/host/event_executor_win.cc
+++ b/remoting/host/event_executor_win.cc
@@ -53,7 +53,7 @@ void EventExecutorWin::InjectMouseEvent(const MouseEvent* event, Task* done) {
 }
 
 void EventExecutorWin::HandleKey(const KeyEvent* event) {
-  int key = event->key();
+  int key = event->keycode();
   bool down = event->pressed();
 
   // Calculate scan code from virtual key.
diff --git a/remoting/proto/event.proto b/remoting/proto/event.proto
index f4cc690..19c734d 100644
--- a/remoting/proto/event.proto
+++ b/remoting/proto/event.proto
@@ -14,7 +14,7 @@ package remoting.protocol;
 // NEXT ID: 3
 message KeyEvent {
   // The POSIX key code.
-  required int32 key = 1;
+  required int32 keycode = 1;
   required bool pressed = 2;
 }
 
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 7c4385b..a88c3b6 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -19,9 +19,3 @@ message ControlMessage {
   optional SuggestResolutionRequest suggest_resolution = 1;
   optional NotifyResolutionRequest notify_resolution = 2;
 }
-
-// TODO(garykac) This is dead, remove remaining references and delete.
-message ChromotingClientMessage {
-  optional KeyEvent key_event = 1;
-  optional MouseEvent mouse_event = 2;
-}
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc
index d85c37b..f2ecfcc 100644
--- a/remoting/protocol/message_decoder_unittest.cc
+++ b/remoting/protocol/message_decoder_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
-#include "remoting/proto/internal.pb.h"
+#include "remoting/proto/event.pb.h"
 #include "remoting/protocol/message_decoder.h"
 #include "remoting/protocol/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -16,7 +16,7 @@ namespace protocol {
 
 static const int kTestKey = 142;
 
-static void AppendMessage(const ChromotingClientMessage& msg,
+static void AppendMessage(const EventMessage& msg,
                           std::string* buffer) {
   // Contains one encoded message.
   scoped_refptr<net::IOBufferWithSize> encoded_msg;
@@ -29,12 +29,14 @@ static void PrepareData(uint8** buffer, int* size) {
   // Contains all encoded messages.
   std::string encoded_data;
 
-  ChromotingClientMessage msg;
+  EventMessage msg;
 
   // Then append 10 update sequences to the data.
   for (int i = 0; i < 10; ++i) {
-    msg.mutable_key_event()->set_key(kTestKey + i);
-    msg.mutable_key_event()->set_pressed((i % 2) != 0);
+    Event* event = msg.add_event();
+    event->set_timestamp(i);
+    event->mutable_key()->set_keycode(kTestKey + i);
+    event->mutable_key()->set_pressed((i % 2) != 0);
     AppendMessage(msg, &encoded_data);
     msg.Clear();
   }
@@ -59,7 +61,7 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
 
   // Then feed the protocol decoder using the above generated data and the
   // read pattern.
-  std::list<ChromotingClientMessage*> message_list;
+  std::list<EventMessage*> message_list;
   for (int i = 0; i < size;) {
     // First generate the amount to feed the decoder.
     int read = std::min(size - i, read_sequence[i % sequence_size]);
@@ -75,17 +77,18 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
   EXPECT_EQ(10u, message_list.size());
 
   int index = 0;
-  for (std::list<ChromotingClientMessage*>::iterator it =
+  for (std::list<EventMessage*>::iterator it =
            message_list.begin();
        it != message_list.end(); ++it) {
-    ChromotingClientMessage* message = *it;
+    EventMessage* message = *it;
     // Partial update stream.
-    EXPECT_TRUE(message->has_key_event());
+    EXPECT_EQ(message->event_size(), 1);
+    EXPECT_TRUE(message->event(0).has_key());
 
     // TODO(sergeyu): Don't use index here. Instead store the expected values
     // in an array.
-    EXPECT_EQ(kTestKey + index, message->key_event().key());
-    EXPECT_EQ((index % 2) != 0, message->key_event().pressed());
+    EXPECT_EQ(kTestKey + index, message->event(0).key().keycode());
+    EXPECT_EQ((index % 2) != 0, message->event(0).key().pressed());
     ++index;
   }
   STLDeleteElements(&message_list);
diff --git a/remoting/protocol/mock_objects.h b/remoting/protocol/mock_objects.h
index 676a608..0c2cc76 100644
--- a/remoting/protocol/mock_objects.h
+++ b/remoting/protocol/mock_objects.h
@@ -34,9 +34,6 @@ class MockConnectionToClientEventHandler :
  public:
   MockConnectionToClientEventHandler() {}
 
-  MOCK_METHOD2(HandleMessage,
-               void(ConnectionToClient* viewer,
-                    ChromotingClientMessage* message));
   MOCK_METHOD1(OnConnectionOpened, void(ConnectionToClient* connection));
   MOCK_METHOD1(OnConnectionClosed, void(ConnectionToClient* connection));
   MOCK_METHOD1(OnConnectionFailed, void(ConnectionToClient* connection));