Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Unified Diff: remoting/base/codec_test.cc

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/base/decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/codec_test.cc
diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index fd4469ca2b1b2e8fb184f081c340343cf1126a75..40c42ed6fc2c0aa163882af6d72d180a40d459a8 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -85,7 +85,7 @@ class EncoderMessageTester {
}
// Test that we received the correct message.
- void ReceivedMessage(HostMessage* message) {
+ void ReceivedMessage(ChromotingHostMessage* message) {
EXPECT_TRUE(message->has_update_stream_packet());
if (state_ == kWaitingForBeginRect) {
@@ -162,7 +162,7 @@ class DecoderTester {
EXPECT_TRUE(frame_.get());
}
- void ReceivedMessage(HostMessage* message) {
+ void ReceivedMessage(ChromotingHostMessage* message) {
if (message->has_update_stream_packet()) {
decoder_->PartialDecode(message);
return;
@@ -265,7 +265,7 @@ class EncoderTester {
EXPECT_GT(data_available_, 0);
}
- void DataAvailable(HostMessage* message,
+ void DataAvailable(ChromotingHostMessage* message,
Encoder::EncodingState state) {
++data_available_;
message_tester_->ReceivedMessage(message);
@@ -274,7 +274,7 @@ class EncoderTester {
// Send the message to the DecoderTester.
if (decoder_tester_) {
if (state & Encoder::EncodingStarting) {
- HostMessage* begin_update = new HostMessage();
+ ChromotingHostMessage* begin_update = new ChromotingHostMessage();
begin_update->mutable_begin_update_stream();
decoder_tester_->ReceivedMessage(begin_update);
}
@@ -284,7 +284,7 @@ class EncoderTester {
}
if (state & Encoder::EncodingEnded) {
- HostMessage* end_update = new HostMessage();
+ ChromotingHostMessage* end_update = new ChromotingHostMessage();
end_update->mutable_end_update_stream();
decoder_tester_->ReceivedMessage(end_update);
}
« no previous file with comments | « no previous file | remoting/base/decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698