Update stable to r4611.

git-svn-id: http://webrtc.googlecode.com/svn/stable/talk@4612 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc
index a731b8d..e86658a 100644
--- a/p2p/base/p2ptransportchannel_unittest.cc
+++ b/p2p/base/p2ptransportchannel_unittest.cc
@@ -1416,10 +1416,14 @@
                    ep2_ch1()->writable(),
                    1000);
 
-  EXPECT_EQ(cricket::PRFLX_PORT_TYPE, RemoteCandidate(ep1_ch1())->type());
-  EXPECT_EQ(cricket::LOCAL_PORT_TYPE, LocalCandidate(ep1_ch1())->type());
-  EXPECT_EQ(cricket::LOCAL_PORT_TYPE, RemoteCandidate(ep2_ch1())->type());
-  EXPECT_EQ(cricket::LOCAL_PORT_TYPE, LocalCandidate(ep2_ch1())->type());
+  EXPECT_EQ(std::string(cricket::PRFLX_PORT_TYPE),
+            RemoteCandidate(ep1_ch1())->type());
+  EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
+            LocalCandidate(ep1_ch1())->type());
+  EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
+            RemoteCandidate(ep2_ch1())->type());
+  EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
+            LocalCandidate(ep2_ch1())->type());
 
   TestSendRecv(1);
   DestroyChannels();