summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api
diff options
context:
space:
mode:
authorarthurhsu@chromium.org <arthurhsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 02:23:33 +0000
committerarthurhsu@chromium.org <arthurhsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 02:23:33 +0000
commitd14263ec8ce5fed27da46575592037413817fbf6 (patch)
treee1e1a94205088e7952e01d5f2c6c942353197f0b /chrome/browser/extensions/api
parent3f55aa10587b3eaa629d7e95de87998b399fe3e2 (diff)
downloadchromium_src-d14263ec8ce5fed27da46575592037413817fbf6.zip
chromium_src-d14263ec8ce5fed27da46575592037413817fbf6.tar.gz
chromium_src-d14263ec8ce5fed27da46575592037413817fbf6.tar.bz2
Revert 113293 - Fix leak; remove "explicit" keyword from multi-argument constructor.
BUG=106529 TEST=removed suppressions from mem/heap check tools Review URL: http://codereview.chromium.org/8819029 TBR=miket@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
-rw-r--r--chrome/browser/extensions/api/socket/socket_api_controller.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/socket/socket_api_controller.cc b/chrome/browser/extensions/api/socket/socket_api_controller.cc
index 30890b8..2195297 100644
--- a/chrome/browser/extensions/api/socket/socket_api_controller.cc
+++ b/chrome/browser/extensions/api/socket/socket_api_controller.cc
@@ -22,8 +22,8 @@ namespace extensions {
// we need to manage it in the context of an extension.
class Socket {
public:
- Socket(const Profile* profile, const std::string& src_extension_id,
- const GURL& src_url);
+ explicit Socket(const Profile* profile, const std::string& src_extension_id,
+ const GURL& src_url);
~Socket();
bool Connect(const net::IPEndPoint& ip_end_point);
@@ -38,7 +38,7 @@ class Socket {
std::string src_extension_id_;
GURL src_url_;
- scoped_ptr<net::UDPClientSocket> udp_client_socket_;
+ net::UDPClientSocket* udp_client_socket_;
bool is_connected_;
net::OldCompletionCallbackImpl<Socket> io_callback_;