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 --- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'jingle/notifier/base') diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc index f7ddf8d..24aa6a9 100644 --- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc +++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc @@ -101,10 +101,9 @@ std::string GaiaTokenPreXmppAuth::GetAuthMechanism() const { std::string GaiaTokenPreXmppAuth::ChooseBestSaslMechanism( const std::vector & mechanisms, bool encrypted) { - return (std::find(mechanisms.begin(), mechanisms.end(), auth_mechanism_) != - mechanisms.end()) - ? auth_mechanism_ - : std::string(); + return (std::find(mechanisms.begin(), + mechanisms.end(), auth_mechanism_) != + mechanisms.end()) ? auth_mechanism_ : ""; } buzz::SaslMechanism* GaiaTokenPreXmppAuth::CreateSaslMechanism( -- cgit v1.1