Non-Local Join for Media Router and Presentation API

chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc

Index: chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
index d3873ed369ee482d03b9f12e6844ccb443449849..f3c931fc9aaafdb9f4b76d0b9754d3c55e65ca0e 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
@@ -119,16 +119,26 @@ TEST_F(MediaRouterWebUIMessageHandlerTest, UpdateRoutes) {
   MediaRoute::Id route_id("routeId123");
   MediaSink::Id sink_id("sinkId123");
   MediaSink sink(sink_id, "The sink", MediaSink::IconType::CAST);
+  MediaRoute::Id joinable_route_id("joinable_routeId123");
+  MediaSink::Id joinable_sink_id("joinable_sinkId123");
+  MediaSink joinable_sink(joinable_sink_id,
+                          "The joinable_sink",
+                          MediaSink::IconType::CAST);
+  MediaSource media_source("mediaSource");
   std::string description("This is a route");
   bool is_local = true;
   std::vector<MediaRoute> routes;
-  routes.push_back(MediaRoute(route_id, MediaSource("mediaSource"), sink_id,
+  routes.push_back(MediaRoute(route_id, media_source, sink_id,
                               description, is_local, kControllerPathForTesting,
                               true));
-
-  EXPECT_CALL(*mock_media_router_ui_, GetRouteProviderExtensionId()).WillOnce(
-      ReturnRef(provider_extension_id()));
-  handler_->UpdateRoutes(routes);
+  std::vector<MediaRoute> joinable_routes;
+  joinable_routes.push_back(MediaRoute(joinable_route_id, media_source,
+                              joinable_sink_id, description, is_local,
+                              kControllerPathForTesting, true));
+
+  EXPECT_CALL(*mock_media_router_ui_, GetRouteProviderExtensionId()).Times(2)
+    .WillRepeatedly(ReturnRef(provider_extension_id()));
+  handler_->UpdateRoutes(routes, joinable_routes);
   EXPECT_EQ(1u, web_ui_->call_data().size());
   const content::TestWebUI::CallData& call_data = *web_ui_->call_data()[0];
   EXPECT_EQ("media_router.ui.setRouteList", call_data.function_name());
@@ -137,6 +147,12 @@ TEST_F(MediaRouterWebUIMessageHandlerTest, UpdateRoutes) {
   EXPECT_TRUE(arg1->GetAsList(&routes_list_value));
   const base::DictionaryValue* route_value = nullptr;
   EXPECT_TRUE(routes_list_value->GetDictionary(0, &route_value));
+  const base::Value* arg2 = call_data.arg2();
+  const base::ListValue* joinable_routes_list_value = nullptr;
+  EXPECT_TRUE(arg2->GetAsList(&joinable_routes_list_value));
+  const base::DictionaryValue* joinable_route_value = nullptr;
+  EXPECT_TRUE(joinable_routes_list_value->GetDictionary(0,
+                                                        &joinable_route_value));
 
   std::string value;
   EXPECT_TRUE(route_value->GetString("id", &value));
@@ -145,6 +161,12 @@ TEST_F(MediaRouterWebUIMessageHandlerTest, UpdateRoutes) {
   EXPECT_EQ(sink_id, value);
   EXPECT_TRUE(route_value->GetString("description", &value));
   EXPECT_EQ(description, value);
+  EXPECT_TRUE(joinable_route_value->GetString("id", &value));
+  EXPECT_EQ(joinable_route_id, value);
+  EXPECT_TRUE(joinable_route_value->GetString("sinkId", &value));
+  EXPECT_EQ(joinable_sink_id, value);
+  EXPECT_TRUE(joinable_route_value->GetString("description", &value));
+  EXPECT_EQ(description, value);
 
   bool actual_is_local = false;
   EXPECT_TRUE(route_value->GetBoolean("isLocal", &actual_is_local));