commit 583949813934903018cd328e21cff45d14d33342
author sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Dec 05 22:51:17 2013
committer sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Dec 05 22:51:17 2013
tree 13801d97f02aa8e7235ab3f096da3ad98a9593bf
parent 03b738377f4221c8d83262655428f23b7ddc858d

Update stable to r5233.

git-svn-id: http://webrtc.googlecode.com/svn/stable/talk@5234 4adac7df-926f-26a2-2b94-8c16560cd09d

session/media/mediasession_unittest.cc

diff --git a/session/media/mediasession_unittest.cc b/session/media/mediasession_unittest.cc
index dbd8db9..0e64566 100644
--- a/session/media/mediasession_unittest.cc
+++ b/session/media/mediasession_unittest.cc
@@ -1492,7 +1492,7 @@
       GetFirstVideoContentDescription(updated_answer.get());
 
   ASSERT_EQ("H264", updated_vcd->codecs()[0].name);
-  ASSERT_EQ(cricket::kRtxCodecName, updated_vcd->codecs()[1].name);
+  ASSERT_EQ(std::string(cricket::kRtxCodecName), updated_vcd->codecs()[1].name);
   int new_h264_pl_type =  updated_vcd->codecs()[0].id;
   EXPECT_NE(used_pl_type, new_h264_pl_type);
   VideoCodec rtx = updated_vcd->codecs()[1];