summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:05:28 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:05:28 +0000
commitd0af7203fccbb273cd4ee112b12ca93c18441efa (patch)
tree6410ef23531cf87aac1981a74326ced5a25fa0df /jingle
parent7f71e75e4eb1decfdc52f28b2ec48671d09f373b (diff)
downloadchromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.zip
chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.gz
chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.bz2
Revert "FBTF: Another big ctor/dtor cleanup found by automated tools."
This reverts commit 27ea47d65cf8767f350113d5ad9e25170efde811 (r61237). BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3609005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/communicator/connection_settings.cc8
-rw-r--r--jingle/notifier/communicator/connection_settings.h6
2 files changed, 2 insertions, 12 deletions
diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc
index 1648c4e..a16ce39 100644
--- a/jingle/notifier/communicator/connection_settings.cc
+++ b/jingle/notifier/communicator/connection_settings.cc
@@ -21,10 +21,6 @@ class RandomGenerator {
}
};
-ConnectionSettings::ConnectionSettings() : protocol_(cricket::PROTO_TCP) {}
-
-ConnectionSettings::~ConnectionSettings() {}
-
void ConnectionSettings::FillXmppClientSettings(
buzz::XmppClientSettings* xcs) const {
DCHECK(xcs);
@@ -34,10 +30,6 @@ void ConnectionSettings::FillXmppClientSettings(
xcs->set_use_proxy_auth(false);
}
-ConnectionSettingsList::ConnectionSettingsList() {}
-
-ConnectionSettingsList::~ConnectionSettingsList() {}
-
void ConnectionSettingsList::AddPermutations(const std::string& hostname,
const std::vector<uint32>& iplist,
int16 port,
diff --git a/jingle/notifier/communicator/connection_settings.h b/jingle/notifier/communicator/connection_settings.h
index b26f559..9f7e4b1 100644
--- a/jingle/notifier/communicator/connection_settings.h
+++ b/jingle/notifier/communicator/connection_settings.h
@@ -15,8 +15,7 @@ namespace notifier {
class ConnectionSettings {
public:
- ConnectionSettings();
- ~ConnectionSettings();
+ ConnectionSettings() : protocol_(cricket::PROTO_TCP) {}
cricket::ProtocolType protocol() { return protocol_; }
const talk_base::SocketAddress& server() const { return server_; }
@@ -34,8 +33,7 @@ class ConnectionSettings {
class ConnectionSettingsList {
public:
- ConnectionSettingsList();
- ~ConnectionSettingsList();
+ ConnectionSettingsList() {}
int GetCount() { return list_.size(); }
ConnectionSettings* GetSettings(size_t index) { return &list_[index]; }