From 69d7f89d6a93e0fbce451960287066195c6d4ea0 Mon Sep 17 00:00:00 2001 From: "dcheng@chromium.org" Date: Tue, 9 Apr 2013 06:41:12 +0000 Subject: Revert "Rewrite std::string("") to std::string(), Linux edition." This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6. Revert "Fix build after r193020." This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a. Revert "Really fix build after r193020." This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/protocol/jingle_session.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'remoting/protocol/jingle_session.cc') diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index 72985c2..c6a4f22 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -323,8 +323,7 @@ void JingleSession::OnMessageResponse( CloseInternal(SIGNALING_TIMEOUT); return; } else { - const std::string& type = - response->Attr(buzz::QName(std::string(), "type")); + const std::string& type = response->Attr(buzz::QName("", "type")); if (type != "result") { LOG(ERROR) << "Received error in response to " << type_str << " message: \"" << response->Str() @@ -384,7 +383,7 @@ void JingleSession::OnTransportInfoResponse(IqRequest* request, return; } - const std::string& type = response->Attr(buzz::QName(std::string(), "type")); + const std::string& type = response->Attr(buzz::QName("", "type")); if (type != "result") { LOG(ERROR) << "Received error in response to transport-info message: \"" << response->Str() << "\". Terminating the session."; -- cgit v1.1