Commit b76a274e authored by sergeyu@chromium.org's avatar sergeyu@chromium.org

Rename remoting/protocol/util.h to message_serialization.h

Both base and protocol directories had util.cc files, which confuses
the linker when compiling them into a single static .a lib.

BUG=276739

Review URL: https://codereview.chromium.org/231943005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262938 0039d316-1c4b-4281-b951-d872f2087c98
parent de0dfa59
......@@ -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"
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
// 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"
......
// 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_
......@@ -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 {
......
......@@ -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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment