Index: remoting/jingle_glue/xmpp_signal_strategy.cc |
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc |
index 51bbadee19038505268fae58f626d58c32c81226..88fc9f30dfb2e6885603e0aceae679bb54ae832a 100644 |
--- a/remoting/jingle_glue/xmpp_signal_strategy.cc |
+++ b/remoting/jingle_glue/xmpp_signal_strategy.cc |
@@ -91,9 +91,10 @@ void XmppSignalStrategy::Connect() { |
task_runner_.reset(new jingle_glue::TaskPump()); |
xmpp_client_ = new buzz::XmppClient(task_runner_.get()); |
- xmpp_client_->Connect(settings, "", socket, CreatePreXmppAuth(settings)); |
- xmpp_client_->SignalStateChange.connect( |
- this, &XmppSignalStrategy::OnConnectionStateChanged); |
+ xmpp_client_->Connect( |
+ settings, std::string(), socket, CreatePreXmppAuth(settings)); |
+ xmpp_client_->SignalStateChange |
+ .connect(this, &XmppSignalStrategy::OnConnectionStateChanged); |
xmpp_client_->engine()->AddStanzaHandler(this, buzz::XmppEngine::HL_TYPE); |
xmpp_client_->Start(); |
@@ -156,7 +157,7 @@ std::string XmppSignalStrategy::GetNextId() { |
if (!xmpp_client_) { |
// If the connection has been terminated then it doesn't matter |
// what Id we return. |
- return ""; |
+ return std::string(); |
} |
return xmpp_client_->NextId(); |
} |