Non-Local Join for Media Router and Presentation API

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/test_util.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::SaveArg;
 
 namespace media_router {
 
 class MockRoutesUpdatedCallback {
  public:
-  MOCK_METHOD1(OnRoutesUpdated, void(const std::vector<MediaRoute>& routes));
+  MOCK_METHOD2(OnRoutesUpdated,
+               void(const std::vector<MediaRoute>& routes,
+                    const std::vector<MediaRoute::Id>& joinable_route_ids));
 };
 
 class MediaRouterUITest : public ::testing::Test {
  public:
   MediaRouterUITest() {
     web_contents_.reset(content::WebContents::Create(
         content::WebContents::CreateParams(&profile_)));
     web_ui_.set_web_contents(web_contents_.get());
     media_router_ui_.reset(new MediaRouterUI(&web_ui_));
   }
@@ skipping 32 matching lines @@
   media_router_ui_->OnResultsUpdated(unsorted_sinks);
   const auto& sorted_sinks = media_router_ui_->sinks_;
   EXPECT_EQ(sink_name2, sorted_sinks[0].sink.name());
   EXPECT_EQ(sink_id3, sorted_sinks[1].sink.id());
   EXPECT_EQ(sink_id1, sorted_sinks[2].sink.id());
 }
 
 TEST_F(MediaRouterUITest, UIMediaRoutesObserverFiltersNonDisplayRoutes) {
   MockMediaRouter mock_router;
   EXPECT_CALL(mock_router, RegisterMediaRoutesObserver(_)).Times(1);
+  MediaSource media_source("mediaSource");
   MockRoutesUpdatedCallback mock_callback;
   scoped_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
       new MediaRouterUI::UIMediaRoutesObserver(
-          &mock_router, base::Bind(&MockRoutesUpdatedCallback::OnRoutesUpdated,
+          &mock_router, media_source.id(),
+          base::Bind(&MockRoutesUpdatedCallback::OnRoutesUpdated,
                                    base::Unretained(&mock_callback))));
 
-  MediaRoute display_route_1("routeId1", MediaSource("mediaSource"), "sinkId1",
+  MediaRoute display_route_1("routeId1", media_source, "sinkId1",
                              "desc 1", true, "", true);
-  MediaRoute non_display_route_1("routeId2", MediaSource("mediaSource"),
+  MediaRoute non_display_route_1("routeId2", media_source,
                                  "sinkId2", "desc 2", true, "", false);
-  MediaRoute display_route_2("routeId2", MediaSource("mediaSource"), "sinkId2",
+  MediaRoute display_route_2("routeId3", media_source, "sinkId2",
                              "desc 2", true, "", true);
   std::vector<MediaRoute> routes;
   routes.push_back(display_route_1);
   routes.push_back(non_display_route_1);
   routes.push_back(display_route_2);
 
   std::vector<MediaRoute> filtered_routes;
-  EXPECT_CALL(mock_callback, OnRoutesUpdated(_))
-      .WillOnce(SaveArg<0>(&filtered_routes));
-  observer->OnRoutesUpdated(routes);
+  EXPECT_CALL(mock_callback, OnRoutesUpdated(_, _)).WillOnce(
+      SaveArg<0>(&filtered_routes));
+  observer->OnRoutesUpdated(routes,
+                            std::vector<MediaRoute::Id>());
 
   ASSERT_EQ(2u, filtered_routes.size());
   EXPECT_TRUE(display_route_1.Equals(filtered_routes[0]));
   EXPECT_TRUE(filtered_routes[0].for_display());
   EXPECT_TRUE(display_route_2.Equals(filtered_routes[1]));
   EXPECT_TRUE(filtered_routes[1].for_display());
 
   EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1);
   observer.reset();
 }
 
+TEST_F(MediaRouterUITest,
+    UIMediaRoutesObserverFiltersNonDisplayJoinableRoutes) {
+  MockMediaRouter mock_router;
+  EXPECT_CALL(mock_router, RegisterMediaRoutesObserver(_)).Times(1);
+  MediaSource media_source("mediaSource");
+  MockRoutesUpdatedCallback mock_callback;
+  scoped_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
+      new MediaRouterUI::UIMediaRoutesObserver(
+          &mock_router, media_source.id(),
+          base::Bind(&MockRoutesUpdatedCallback::OnRoutesUpdated,
+                                   base::Unretained(&mock_callback))));

[apacible, 2015/12/18 22:34:19]

nit: fix indentation.

[matt.boetger, 2015/12/18 23:37:15]

Done.

+
+  MediaRoute display_route_1("routeId1", media_source, "sinkId1",
+                             "desc 1", true, "", true);
+  MediaRoute non_display_route_1("routeId2", media_source,
+                                 "sinkId2", "desc 2", true, "", false);
+  MediaRoute display_route_2("routeId3", media_source, "sinkId2",
+                             "desc 2", true, "", true);
+  std::vector<MediaRoute> routes;
+  routes.push_back(display_route_1);
+  routes.push_back(non_display_route_1);
+  routes.push_back(display_route_2);
+
+  std::vector<MediaRoute::Id> joinable_route_ids;
+  joinable_route_ids.push_back("routeId1");
+  joinable_route_ids.push_back("routeId2");
+  joinable_route_ids.push_back("routeId3");
+
+  std::vector<MediaRoute::Id> filtered_joinable_route_ids;
+  // Save the filtered joinable routes.
+  EXPECT_CALL(mock_callback, OnRoutesUpdated(_, _)).WillOnce(
+      SaveArg<1>(&filtered_joinable_route_ids));
+  observer->OnRoutesUpdated(routes,
+                            joinable_route_ids);
+
+  ASSERT_EQ(2u, filtered_joinable_route_ids.size());
+  EXPECT_EQ(display_route_1.media_route_id(), filtered_joinable_route_ids[0]);
+  EXPECT_EQ(display_route_2.media_route_id(), filtered_joinable_route_ids[1]);
+
+  EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1);
+  observer.reset();
+}
+
 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
   std::string id = "extensionid";
   GURL url = GURL("chrome-extension://" + id);
   scoped_ptr<extensions::ExtensionRegistry> registry =
       make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
   scoped_refptr<extensions::Extension> app =
       extensions::test_util::BuildApp(extensions::ExtensionBuilder().Pass())
           .MergeManifest(
               extensions::DictionaryBuilder().Set("name", "test app name"))
           .SetID(id)
@@ skipping 14 matching lines @@
 }
 
 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
   GURL url = GURL("https://www.google.com");
   scoped_ptr<extensions::ExtensionRegistry> registry =
       make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
 
   EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
 }
 }  // namespace media_router