summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /content/renderer
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback. Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g. BUG=98719 TEST=none Review URL: http://codereview.chromium.org/8070013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/p2p/p2p_transport_impl.h2
-rw-r--r--content/renderer/p2p/p2p_transport_impl_unittest.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h
index d4d1baa..b807e44 100644
--- a/content/renderer/p2p/p2p_transport_impl.h
+++ b/content/renderer/p2p/p2p_transport_impl.h
@@ -89,7 +89,7 @@ class CONTENT_EXPORT P2PTransportImpl
scoped_ptr<jingle_glue::TransportChannelSocketAdapter> channel_adapter_;
scoped_ptr<jingle_glue::PseudoTcpAdapter> pseudo_tcp_adapter_;
- net::CompletionCallbackImpl<P2PTransportImpl> connect_callback_;
+ net::OldCompletionCallbackImpl<P2PTransportImpl> connect_callback_;
DISALLOW_COPY_AND_ASSIGN(P2PTransportImpl);
};
diff --git a/content/renderer/p2p/p2p_transport_impl_unittest.cc b/content/renderer/p2p/p2p_transport_impl_unittest.cc
index 83c23e5..00798de 100644
--- a/content/renderer/p2p/p2p_transport_impl_unittest.cc
+++ b/content/renderer/p2p/p2p_transport_impl_unittest.cc
@@ -178,8 +178,8 @@ class UdpChannelTester : public base::RefCountedThreadSafe<UdpChannelTester> {
scoped_refptr<net::IOBuffer> sent_packets_[kMessages];
scoped_refptr<net::IOBuffer> read_buffer_;
- net::CompletionCallbackImpl<UdpChannelTester> write_cb_;
- net::CompletionCallbackImpl<UdpChannelTester> read_cb_;
+ net::OldCompletionCallbackImpl<UdpChannelTester> write_cb_;
+ net::OldCompletionCallbackImpl<UdpChannelTester> read_cb_;
int write_errors_;
int read_errors_;
int packets_sent_;
@@ -314,8 +314,8 @@ class TcpChannelTester : public base::RefCountedThreadSafe<TcpChannelTester> {
std::vector<char> sent_data_;
std::vector<char> received_data_;
- net::CompletionCallbackImpl<TcpChannelTester> write_cb_;
- net::CompletionCallbackImpl<TcpChannelTester> read_cb_;
+ net::OldCompletionCallbackImpl<TcpChannelTester> write_cb_;
+ net::OldCompletionCallbackImpl<TcpChannelTester> read_cb_;
int write_errors_;
int read_errors_;
};