Pass origin to StartObservingMediaSinks.

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

Index: chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
index 2918454c64cd17339027ccd581eed36465ce440a..3d05a2037fe5d6a7cbb11e1f68c272b1aed3fa29 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
+++ b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
@@ -40,11 +40,12 @@ class QueryResultManagerTest : public ::testing::Test {
       : mock_router_(), query_result_manager_(&mock_router_) {
   }
 
-  void DiscoverSinks(MediaCastMode cast_mode, const MediaSource& source) {
+  void DiscoverSinks(MediaCastMode cast_mode, const MediaSource& source,
+                     const GURL& origin) {
     EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
         .WillOnce(Return(true));
     EXPECT_CALL(mock_observer_, OnResultsUpdated(_)).Times(1);
-    query_result_manager_.StartSinksQuery(cast_mode, source);
+    query_result_manager_.StartSinksQuery(cast_mode, source, origin);
   }
 
   MockMediaRouter mock_router_;
@@ -95,9 +96,10 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
   EXPECT_TRUE(actual_source.Empty());
 
   MediaSource source(MediaSourceForPresentationUrl("http://fooUrl"));
+  GURL origin("http://fooUrl");

[mark a. foltz, 2016/02/17 21:50:51]

Nit: Technically this is a valid URL but can we use URLs with a TLD instead?

[matt.boetger, 2016/02/18 00:50:33]

Done.

   EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
       .WillOnce(Return(true));
-  query_result_manager_.StartSinksQuery(MediaCastMode::DEFAULT, source);
+  query_result_manager_.StartSinksQuery(MediaCastMode::DEFAULT, source, origin);
 
   query_result_manager_.GetSupportedCastModes(&cast_modes);
   EXPECT_EQ(1u, cast_modes.size());
@@ -108,11 +110,12 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
 
   // Register a different source for the same cast mode.
   MediaSource another_source(MediaSourceForPresentationUrl("http://barUrl"));
+  GURL another_origin("http://barUrl");

[mark a. foltz, 2016/02/17 21:50:51]

Ditto

[matt.boetger, 2016/02/18 00:50:33]

Done.

   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
   EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
       .WillOnce(Return(true));
   query_result_manager_.StartSinksQuery(
-      MediaCastMode::DEFAULT, another_source);
+      MediaCastMode::DEFAULT, another_source, another_origin);
 
   query_result_manager_.GetSupportedCastModes(&cast_modes);
   EXPECT_EQ(1u, cast_modes.size());
@@ -140,8 +143,11 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
 
   query_result_manager_.AddObserver(&mock_observer_);
   DiscoverSinks(MediaCastMode::DEFAULT,
-                MediaSourceForPresentationUrl("http://barUrl"));
-  DiscoverSinks(MediaCastMode::TAB_MIRROR, MediaSourceForTab(123));
+                MediaSourceForPresentationUrl("http://barUrl"),
+                GURL("http://barUrl"));
+  DiscoverSinks(MediaCastMode::TAB_MIRROR,
+                MediaSourceForTab(123),
+                GURL("http://barUrl"));
 
   // Scenario (results in this order):
   // Action: DEFAULT -> [1, 2, 3]
@@ -214,7 +220,8 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
               OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
   query_result_manager_.StartSinksQuery(
       MediaCastMode::DEFAULT,
-      MediaSourceForPresentationUrl("http://bazurl.com"));
+      MediaSourceForPresentationUrl("http://bazurl.com"),
+      GURL("http://bazurl.com"));
 
   // Action: Remove TAB_MIRROR observer
   // Expected result: