summaryrefslogtreecommitdiffstats
path: root/remoting/host/session_manager_unittest.cc
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
commit53a4597d56e4ca47d70a0f72901d005f0019aca3 (patch)
tree794a2e9af105a28cfacf7b9ae77d7852985bd87c /remoting/host/session_manager_unittest.cc
parentfebe94524deeb320646d623cd91ed87e1db67a7b (diff)
downloadchromium_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/host/session_manager_unittest.cc')
-rw-r--r--remoting/host/session_manager_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 29fa0f8..6747b01 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -106,7 +106,7 @@ TEST_F(SessionManagerTest, OneRecordCycle) {
.WillOnce(RunCallback(update_rects, data));
// Expect the encoder be called.
- HostMessage* msg = new HostMessage();
+ ChromotingHostMessage* msg = new ChromotingHostMessage();
EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
.WillOnce(FinishEncode(msg));