12 files changed, 17 insertions, 19 deletions
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index 5c95c7a..7fc1983 100644
--- a/remoting/host/video_scheduler.cc
+++ b/remoting/host/video_scheduler.cc
@@ -19,7 +19,6 @@
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 #include "remoting/protocol/message_decoder.h"
-#include "remoting/protocol/util.h"
 #include "remoting/protocol/video_stub.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_shape.h"
diff --git a/remoting/protocol/audio_writer.cc b/remoting/protocol/audio_writer.cc
index b1855e4..81664e6 100644
--- a/remoting/protocol/audio_writer.cc
+++ b/remoting/protocol/audio_writer.cc
@@ -8,9 +8,9 @@
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/audio.pb.h"
+#include "remoting/protocol/message_serialization.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
-#include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index bf4def4..9a6fc96 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -14,7 +14,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc
index ec77037..599c779 100644
--- a/remoting/protocol/client_control_dispatcher.cc
+++ b/remoting/protocol/client_control_dispatcher.cc
@@ -13,7 +13,7 @@
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/client_stub.h"
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/client_event_dispatcher.cc b/remoting/protocol/client_event_dispatcher.cc
index 639231e..18e2d2d 100644
--- a/remoting/protocol/client_event_dispatcher.cc
+++ b/remoting/protocol/client_event_dispatcher.cc
@@ -10,7 +10,7 @@
 #include "remoting/base/constants.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 978da56..faf8108 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -22,7 +22,6 @@
 #include "remoting/protocol/transport.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
-#include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc
index 671c801..dfb7d18 100644
--- a/remoting/protocol/host_control_dispatcher.cc
+++ b/remoting/protocol/host_control_dispatcher.cc
@@ -12,7 +12,7 @@
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_stub.h"
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc
index f006143..e61e9fa 100644
--- a/remoting/protocol/message_decoder_unittest.cc
+++ b/remoting/protocol/message_decoder_unittest.cc
@@ -10,7 +10,7 @@
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/message_decoder.h"
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
diff --git a/remoting/protocol/util.cc b/remoting/protocol/message_serialization.cc
index e897634..2a22209 100644
--- a/remoting/protocol/util.cc
+++ b/remoting/protocol/message_serialization.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/protocol/util.h"
+#include "remoting/protocol/message_serialization.h"
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
diff --git a/remoting/protocol/util.h b/remoting/protocol/message_serialization.h
index ebcd5e2..c550fbe 100644
--- a/remoting/protocol/util.h
+++ b/remoting/protocol/message_serialization.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 defines utility methods used for encoding and decoding the protocol
 // used in Chromoting.
 
-#ifndef REMOTING_PROTOCOL_UTIL_H_
-#define REMOTING_PROTOCOL_UTIL_H_
+#ifndef REMOTING_PROTOCOL_MESSAGE_SERIALIZATION_H_
+#define REMOTING_PROTOCOL_MESSAGE_SERIALIZATION_H_
 
 #include "net/base/io_buffer.h"
 
@@ -29,4 +29,4 @@ scoped_refptr<net::IOBufferWithSize> SerializeAndFrameMessage(
 }  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_PROTOCOL_UTIL_H_
+#endif  // REMOTING_PROTOCOL_MESSAGE_SERIALIZATION_H_
diff --git a/remoting/protocol/protobuf_video_writer.cc b/remoting/protocol/protobuf_video_writer.cc
index 08e937b..20b139d 100644
--- a/remoting/protocol/protobuf_video_writer.cc
+++ b/remoting/protocol/protobuf_video_writer.cc
@@ -9,8 +9,8 @@
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/channel_factory.h"
+#include "remoting/protocol/message_serialization.h"
 #include "remoting/protocol/session.h"
-#include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/remoting_srcs.gypi b/remoting/remoting_srcs.gypi
index 2be74ca..ed2a260 100644
--- a/remoting/remoting_srcs.gypi
+++ b/remoting/remoting_srcs.gypi
@@ -140,6 +140,8 @@
       'protocol/message_decoder.h',
       'protocol/message_reader.cc',
       'protocol/message_reader.h',
+      'protocol/message_serialization.cc',
+      'protocol/message_serialization.h',
       'protocol/mouse_input_filter.cc',
       'protocol/mouse_input_filter.h',
       'protocol/name_value_map.h',
@@ -167,10 +169,6 @@
       'protocol/session_manager.h',
       'protocol/ssl_hmac_channel_authenticator.cc',
       'protocol/ssl_hmac_channel_authenticator.h',
-      'protocol/transport.cc',
-      'protocol/transport.h',
-      'protocol/util.cc',
-      'protocol/util.h',
       'protocol/third_party_authenticator_base.cc',
       'protocol/third_party_authenticator_base.h',
       'protocol/third_party_client_authenticator.cc',
@@ -178,6 +176,8 @@
       'protocol/third_party_host_authenticator.cc',
       'protocol/third_party_host_authenticator.h',
       'protocol/token_validator.h',
+      'protocol/transport.cc',
+      'protocol/transport.h',
       'protocol/v2_authenticator.cc',
       'protocol/v2_authenticator.h',
       'protocol/video_reader.cc',