Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with…

chrome/browser/media/router/media_route_unittest.cc

Index: chrome/browser/media/router/media_route_unittest.cc
diff --git a/chrome/browser/media/router/media_route_unittest.cc b/chrome/browser/media/router/media_route_unittest.cc
index e52b075ed897f04edf864fefb6fea7a5d7bd3f5c..31f221dbaa787823f158b17b2133a98a13c0b203 100644
--- a/chrome/browser/media/router/media_route_unittest.cc
+++ b/chrome/browser/media/router/media_route_unittest.cc
@@ -7,34 +7,56 @@
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+namespace {
+const char kRouteId1[] =
+    "urn:x-org.chromium:media:route:1/cast-sink1/http://foo.com";
+const char kRouteId2[] =
+    "urn:x-org.chromium:media:route:2/cast-sink2/http://foo.com";
+}  // namespace
+
 namespace media_router {
 
 // Tests the == operator to ensure that only route ID equality is being checked.
 TEST(MediaRouteTest, Equals) {
-  MediaRoute route1("routeId1", MediaSourceForCastApp("DialApp"),
+  MediaRoute route1(kRouteId1, MediaSourceForCastApp("DialApp"),
                     MediaSink("sinkId", "sinkName"), "Description", false);
 
   // Same as route1 with different sink ID.
-  MediaRoute route2("routeId1", MediaSourceForCastApp("DialApp"),
+  MediaRoute route2(kRouteId1, MediaSourceForCastApp("DialApp"),
                     MediaSink("differentSinkId", "different sink"),
                     "Description", false);
   EXPECT_TRUE(route1.Equals(route2));
 
   // Same as route1 with different description.
-  MediaRoute route3("routeId1", MediaSourceForCastApp("DialApp"),
+  MediaRoute route3(kRouteId1, MediaSourceForCastApp("DialApp"),
                     MediaSink("sinkId", "sinkName"), "differentDescription",
                     false);
   EXPECT_TRUE(route1.Equals(route3));
 
   // Same as route1 with different is_local.
-  MediaRoute route4("routeId1", MediaSourceForCastApp("DialApp"),
+  MediaRoute route4(kRouteId1, MediaSourceForCastApp("DialApp"),
                     MediaSink("sinkId", "sinkName"), "Description", true);
   EXPECT_TRUE(route1.Equals(route4));
 
   // The ID is different from route1's.
-  MediaRoute route5("routeId2", MediaSourceForCastApp("DialApp"),
+  MediaRoute route5(kRouteId2, MediaSourceForCastApp("DialApp"),
                     MediaSink("sinkId", "sinkName"), "Description", false);
   EXPECT_FALSE(route1.Equals(route5));
 }
 
+TEST(MediaRouteTest, ParseId) {
+  EXPECT_EQ("1", GetPresentationIdAndUrl(kRouteId1).first);
+  EXPECT_EQ("http://foo.com", GetPresentationIdAndUrl(kRouteId1).second);
+  auto invalid = std::make_pair(std::string(), std::string());
+  EXPECT_EQ(invalid, GetPresentationIdAndUrl("invalid"));
+  EXPECT_EQ(invalid, GetPresentationIdAndUrl(
+                         "urn:x-org.chromium:media:route:2"));
+  EXPECT_EQ(invalid, GetPresentationIdAndUrl(
+                         "urn:x-org.chromium:media:route:2/"));
+  EXPECT_EQ(invalid, GetPresentationIdAndUrl(
+                         "urn:x-org.chromium:media:route:2/cast-sink2/"));
+  EXPECT_EQ(invalid, GetPresentationIdAndUrl(
+                         "urn:x-org.chromium:media:route:2//http://foo.com"));
+}
+
 }  // namespace media_router