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

6 files changed, 13 insertions, 15 deletions

diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index e2408e0..7d82443 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -124,9 +124,10 @@ JingleMessage::NamedCandidate::NamedCandidate(
 
 // static
 bool JingleMessage::IsJingleMessage(const buzz::XmlElement* stanza) {
-  return stanza->Name() == QName(kJabberNamespace, "iq") &&
-         stanza->Attr(QName(std::string(), "type")) == "set" &&
-         stanza->FirstNamed(QName(kJingleNamespace, "jingle")) != NULL;
+  return
+      stanza->Name() == QName(kJabberNamespace, "iq") &&
+      stanza->Attr(QName("", "type")) == "set" &&
+      stanza->FirstNamed(QName(kJingleNamespace, "jingle")) != NULL;
 }
 
 // static
@@ -372,7 +373,7 @@ scoped_ptr<buzz::XmlElement> JingleMessageReply::ToXml(
 
   std::string type;
   std::string error_text;
-  QName name;
+  QName name("");
   switch (error_type) {
     case BAD_REQUEST:
       type = "modify";
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.";
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 76aee23..433356b 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -323,7 +323,7 @@ TEST_F(JingleSessionTest, Connect) {
       initiate_xml->FirstNamed(buzz::QName(kJingleNamespace, "jingle"));
   ASSERT_TRUE(jingle_element);
   ASSERT_EQ(kClientJid,
-            jingle_element->Attr(buzz::QName(std::string(), "initiator")));
+            jingle_element->Attr(buzz::QName("", "initiator")));
 }
 
 // Verify that we can connect two endpoints with multi-step authentication.
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 7a09d09..e27b619 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -139,7 +139,7 @@ void LibjingleStreamTransport::Connect(
   // Create P2PTransportChannel, attach signal handlers and connect it.
   // TODO(sergeyu): Specify correct component ID for the channel.
   channel_.reset(new cricket::P2PTransportChannel(
-      std::string(), 0, NULL, port_allocator_));
+      "", 0, NULL, port_allocator_));
   channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
   channel_->SignalRequestSignaling.connect(
       this, &LibjingleStreamTransport::OnRequestSignaling);
diff --git a/remoting/protocol/third_party_authenticator_unittest.cc b/remoting/protocol/third_party_authenticator_unittest.cc
index 0298877..b787a62 100644
--- a/remoting/protocol/third_party_authenticator_unittest.cc
+++ b/remoting/protocol/third_party_authenticator_unittest.cc
@@ -153,8 +153,7 @@ TEST_F(ThirdPartyAuthenticatorTest, ClientNoSecret) {
   ASSERT_NO_FATAL_FAILURE(InitAuthenticators());
   ASSERT_NO_FATAL_FAILURE(RunHostInitiatedAuthExchange());
   ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, client_->state());
-  ASSERT_NO_FATAL_FAILURE(
-      token_fetcher_->OnTokenFetched(kToken, std::string()));
+  ASSERT_NO_FATAL_FAILURE(token_fetcher_->OnTokenFetched(kToken, ""));
 
   // The end result is that the client rejected the connection, since it
   // couldn't fetch the secret.
@@ -168,7 +167,7 @@ TEST_F(ThirdPartyAuthenticatorTest, InvalidToken) {
   ASSERT_NO_FATAL_FAILURE(token_fetcher_->OnTokenFetched(
       kToken, kSharedSecret));
   ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state());
-  ASSERT_NO_FATAL_FAILURE(token_validator_->OnTokenValidated(std::string()));
+  ASSERT_NO_FATAL_FAILURE(token_validator_->OnTokenValidated(""));
 
   // The end result is that the host rejected the token.
   ASSERT_EQ(Authenticator::REJECTED, host_->state());
@@ -178,8 +177,7 @@ TEST_F(ThirdPartyAuthenticatorTest, CannotFetchToken) {
   ASSERT_NO_FATAL_FAILURE(InitAuthenticators());
   ASSERT_NO_FATAL_FAILURE(RunHostInitiatedAuthExchange());
   ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, client_->state());
-  ASSERT_NO_FATAL_FAILURE(
-      token_fetcher_->OnTokenFetched(std::string(), std::string()));
+  ASSERT_NO_FATAL_FAILURE(token_fetcher_->OnTokenFetched("", ""));
 
   // The end result is that the client rejected the connection, since it
   // couldn't fetch the token.
diff --git a/remoting/protocol/transport.cc b/remoting/protocol/transport.cc
index 13ed29f..4ccbcde 100644
--- a/remoting/protocol/transport.cc
+++ b/remoting/protocol/transport.cc
@@ -20,7 +20,7 @@ std::string TransportRoute::GetTypeString(RouteType type) {
       return "relay";
   }
   NOTREACHED();
-  return std::string();
+  return "";
 }
 
 TransportRoute::TransportRoute() : type(DIRECT) {