| Index: remoting/host/log_to_server_unittest.cc
|
| diff --git a/remoting/host/log_to_server_unittest.cc b/remoting/host/log_to_server_unittest.cc
|
| index 1fb0500a3658efe163195381567f93b24ecf6e6b..99a51ecd6392ab1545f804d4b1b35af0634b564e 100644
|
| --- a/remoting/host/log_to_server_unittest.cc
|
| +++ b/remoting/host/log_to_server_unittest.cc
|
| @@ -36,11 +36,12 @@ const char kHostJid[] = "host@domain.com/1234";
|
|
|
| bool IsLogEntryForConnection(XmlElement* node, const char* connection_type) {
|
| return (node->Name() == QName(kChromotingNamespace, "entry") &&
|
| - node->Attr(QName("", "event-name")) == "session-state" &&
|
| - node->Attr(QName("", "session-state")) == "connected" &&
|
| - node->Attr(QName("", "role")) == "host" &&
|
| - node->Attr(QName("", "mode")) == "me2me" &&
|
| - node->Attr(QName("", "connection-type")) == connection_type);
|
| + node->Attr(QName(std::string(), "event-name")) == "session-state" &&
|
| + node->Attr(QName(std::string(), "session-state")) == "connected" &&
|
| + node->Attr(QName(std::string(), "role")) == "host" &&
|
| + node->Attr(QName(std::string(), "mode")) == "me2me" &&
|
| + node->Attr(QName(std::string(), "connection-type")) ==
|
| + connection_type);
|
| }
|
|
|
| MATCHER_P(IsClientConnected, connection_type, "") {
|
| @@ -91,10 +92,10 @@ MATCHER_P2(IsTwoClientsConnected, connection_type1, connection_type2, "") {
|
|
|
| bool IsLogEntryForDisconnection(XmlElement* node) {
|
| return (node->Name() == QName(kChromotingNamespace, "entry") &&
|
| - node->Attr(QName("", "event-name")) == "session-state" &&
|
| - node->Attr(QName("", "session-state")) == "closed" &&
|
| - node->Attr(QName("", "role")) == "host" &&
|
| - node->Attr(QName("", "mode")) == "me2me");
|
| + node->Attr(QName(std::string(), "event-name")) == "session-state" &&
|
| + node->Attr(QName(std::string(), "session-state")) == "closed" &&
|
| + node->Attr(QName(std::string(), "role")) == "host" &&
|
| + node->Attr(QName(std::string(), "mode")) == "me2me");
|
| }
|
|
|
| MATCHER(IsClientDisconnected, "") {
|
|
|