summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 02:02:40 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 02:02:40 +0000
commitfe89ea7e351d304ca379125329018f5b96a2aded (patch)
treef4a0a43fc9e626d3a8e015a363ebbab635154e4e /jingle
parent1870d5cfa5ca359b44a32322c225cca1b2818e91 (diff)
downloadchromium_src-fe89ea7e351d304ca379125329018f5b96a2aded.zip
chromium_src-fe89ea7e351d304ca379125329018f5b96a2aded.tar.gz
chromium_src-fe89ea7e351d304ca379125329018f5b96a2aded.tar.bz2
Miscelaneous cleanups to AddressList to make it harder to mis-use.
- Removed all destructive non-const member functions -- these were dangerous since if you called them without first making a copy of the AddressList, it could mutate earlier copies. - Made AddressList::Data::head const, so new code added to AddressList cannot inadvertently introduce such dangerous mutations (won't compile). - Moved the non-trivial constructors and assign methods into factory methods (for added readability) - Removed the bool parameter from Copy (for added readability). Review URL: http://codereview.chromium.org/6880302 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/pseudotcp_adapter.cc2
-rw-r--r--jingle/notifier/base/chrome_async_socket_unittest.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc
index 61a50a9..6ea9fbd 100644
--- a/jingle/glue/pseudotcp_adapter.cc
+++ b/jingle/glue/pseudotcp_adapter.cc
@@ -152,7 +152,7 @@ int PseudoTcpAdapter::GetPeerAddress(net::AddressList* address) const {
// We actually don't know the peer address. Returning so the upper layers
// won't complain.
net::IPAddressNumber ip_address(4);
- *address = net::AddressList(ip_address, 0, false);
+ *address = net::AddressList::CreateFromIPAddress(ip_address, 0);
return net::OK;
}
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
index f834d9d..53a2028 100644
--- a/jingle/notifier/base/chrome_async_socket_unittest.cc
+++ b/jingle/notifier/base/chrome_async_socket_unittest.cc
@@ -116,8 +116,8 @@ net::IPAddressNumber Uint32ToIPAddressNumber(uint32 ip) {
net::AddressList SocketAddressToAddressList(
const talk_base::SocketAddress& address) {
DCHECK_NE(address.ip(), 0U);
- return net::AddressList(Uint32ToIPAddressNumber(address.ip()),
- address.port(), false);
+ return net::AddressList::CreateFromIPAddress(
+ Uint32ToIPAddressNumber(address.ip()), address.port());
}
class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {