summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-27 00:00:44 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-27 00:00:44 +0000
commitaa46ba58bd3935d7eaa952b7d37252b4057513e6 (patch)
treebf566756babde4533ced025df33149c7a15d14b5 /remoting/protocol
parent083237baa51586b9db720facb2c07914e22bb753 (diff)
downloadchromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.zip
chromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.tar.gz
chromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.tar.bz2
remoting: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details. BUG=234765 Review URL: https://chromiumcodereview.appspot.com/14522010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/channel_multiplexer.cc2
-rw-r--r--remoting/protocol/fake_authenticator.cc2
-rw-r--r--remoting/protocol/fake_session.cc4
-rw-r--r--remoting/protocol/message_reader.cc2
-rw-r--r--remoting/protocol/negotiating_client_authenticator.cc2
5 files changed, 6 insertions, 6 deletions
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index 69e48e4..59bfba4 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -358,7 +358,7 @@ ChannelMultiplexer::ChannelMultiplexer(ChannelFactory* factory,
: base_channel_factory_(factory),
base_channel_name_(base_channel_name),
next_channel_id_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
ChannelMultiplexer::~ChannelMultiplexer() {
diff --git a/remoting/protocol/fake_authenticator.cc b/remoting/protocol/fake_authenticator.cc
index 26d89de..0107654 100644
--- a/remoting/protocol/fake_authenticator.cc
+++ b/remoting/protocol/fake_authenticator.cc
@@ -20,7 +20,7 @@ FakeChannelAuthenticator::FakeChannelAuthenticator(bool accept, bool async)
async_(async),
did_read_bytes_(false),
did_write_bytes_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
FakeChannelAuthenticator::~FakeChannelAuthenticator() {
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index a659e10..7c0bfde 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -27,7 +27,7 @@ FakeSocket::FakeSocket()
read_buffer_size_(0),
input_pos_(0),
message_loop_(MessageLoop::current()),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
FakeSocket::~FakeSocket() {
@@ -279,7 +279,7 @@ FakeSession::FakeSession()
jid_(kTestJid),
error_(OK),
closed_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
FakeSession::~FakeSession() { }
diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc
index 926b058..7f999d5 100644
--- a/remoting/protocol/message_reader.cc
+++ b/remoting/protocol/message_reader.cc
@@ -26,7 +26,7 @@ MessageReader::MessageReader()
read_pending_(false),
pending_messages_(0),
closed_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
void MessageReader::Init(net::Socket* socket,
diff --git a/remoting/protocol/negotiating_client_authenticator.cc b/remoting/protocol/negotiating_client_authenticator.cc
index 6210cef..5ab0507 100644
--- a/remoting/protocol/negotiating_client_authenticator.cc
+++ b/remoting/protocol/negotiating_client_authenticator.cc
@@ -28,7 +28,7 @@ NegotiatingClientAuthenticator::NegotiatingClientAuthenticator(
fetch_secret_callback_(fetch_secret_callback),
token_fetcher_(token_fetcher.Pass()),
method_set_by_host_(false),
- weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ weak_factory_(this) {
DCHECK(!methods.empty());
for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin();
it != methods.end(); ++it) {