diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 23:05:05 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 23:05:05 +0000 |
| commit | 53a4597d56e4ca47d70a0f72901d005f0019aca3 (patch) | |
| tree | 794a2e9af105a28cfacf7b9ae77d7852985bd87c /remoting/base/protocol_decoder_unittest.cc | |
| parent | febe94524deeb320646d623cd91ed87e1db67a7b (diff) | |
| download | chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.zip chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.gz chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.bz2 | |
Rename (Host|Client)Message to Chromoting(Host|Client)Message.
Rename HostMessage and ClientMessage to Chromoting{Host|Client}Message to
avoid conflicts with messages in X11.
Actually, only ClientMessage needs to be changed due to conflict, but HostMessage is changed to keep the names consistent.
BUG=none
TEST=remoting unittests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57112
Review URL: http://codereview.chromium.org/3161034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/protocol_decoder_unittest.cc')
| -rw-r--r-- | remoting/base/protocol_decoder_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/base/protocol_decoder_unittest.cc b/remoting/base/protocol_decoder_unittest.cc index c2473a8..da13a0d 100644 --- a/remoting/base/protocol_decoder_unittest.cc +++ b/remoting/base/protocol_decoder_unittest.cc @@ -16,7 +16,7 @@ static const int kWidth = 640; static const int kHeight = 480; static const std::string kTestData = "Chromoting rockz"; -static void AppendMessage(const HostMessage& msg, +static void AppendMessage(const ChromotingHostMessage& msg, std::string* buffer) { // Contains one encoded message. scoped_refptr<media::DataBuffer> encoded_msg; @@ -31,7 +31,7 @@ static void PrepareData(uint8** buffer, int* size) { std::string encoded_data; // The first message is InitClient. - HostMessage msg; + ChromotingHostMessage msg; msg.mutable_init_client()->set_width(kWidth); msg.mutable_init_client()->set_height(kHeight); AppendMessage(msg, &encoded_data); |