| Index: remoting/protocol/channel_multiplexer.cc
|
| diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
|
| index 69e48e40316a21c3f700688fc24a49b8079581d8..59bfba40b9f76f95f532092c15c93138be7cf377 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() {
|
|
|