summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/rtp_reader.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 05:07:40 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 05:07:40 +0000
commit9e2a3137641bc104980e13388b6088d3f4a9b52f (patch)
tree353e7915a047c43b466f2d4de514605a71691b45 /remoting/protocol/rtp_reader.cc
parent7feba7ed4d88f95d041abd6bea7a2ba93d9a9f3a (diff)
downloadchromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.zip
chromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.tar.gz
chromium_src-9e2a3137641bc104980e13388b6088d3f4a9b52f.tar.bz2
Switch remoting/protocol to new callbacks
There is still some code that uses old callbacks (particularly unittests) - I will convert them in a separate CL. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/8116021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/rtp_reader.cc')
-rw-r--r--remoting/protocol/rtp_reader.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/protocol/rtp_reader.cc b/remoting/protocol/rtp_reader.cc
index e99472f..50c2d82 100644
--- a/remoting/protocol/rtp_reader.cc
+++ b/remoting/protocol/rtp_reader.cc
@@ -36,8 +36,9 @@ RtpReader::~RtpReader() {
}
void RtpReader::Init(net::Socket* socket,
- OnMessageCallback* on_message_callback) {
- on_message_callback_.reset(on_message_callback);
+ const OnMessageCallback& on_message_callback) {
+ DCHECK(!on_message_callback.is_null());
+ on_message_callback_ = on_message_callback;
SocketReaderBase::Init(socket);
}
@@ -90,7 +91,7 @@ void RtpReader::OnDataReceived(net::IOBuffer* buffer, int data_size) {
++total_packets_received_;
- on_message_callback_->Run(packet);
+ on_message_callback_.Run(packet);
}
void RtpReader::GetReceiverReport(RtcpReceiverReport* report) {