[Media Router] Add origins to sink query results.

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..862294c6d099ff7b46bb557f86e2e06c2fa7ef71 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
@@ -14,7 +14,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using testing::ContainerEq;
 using testing::Eq;
 using testing::IsEmpty;
 using testing::Eq;
@@ -44,7 +43,8 @@ class QueryResultManagerTest : public ::testing::Test {
     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,
+                                          GURL("https://origin.com"));
   }
 
   MockMediaRouter mock_router_;
@@ -86,6 +86,7 @@ TEST_F(QueryResultManagerTest, Observers) {
 }
 
 TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
+  GURL origin("https://origin.com");
   CastModeSet cast_modes;
 
   query_result_manager_.GetSupportedCastModes(&cast_modes);
@@ -97,7 +98,7 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
   MediaSource source(MediaSourceForPresentationUrl("http://fooUrl"));
   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());
@@ -111,8 +112,8 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
   EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
       .WillOnce(Return(true));
-  query_result_manager_.StartSinksQuery(
-      MediaCastMode::DEFAULT, another_source);
+  query_result_manager_.StartSinksQuery(MediaCastMode::DEFAULT, another_source,
+                                        origin);
 
   query_result_manager_.GetSupportedCastModes(&cast_modes);
   EXPECT_EQ(1u, cast_modes.size());
@@ -137,6 +138,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
   MediaSink sink3("sinkId3", "Sink 3", MediaSink::IconType::CAST);
   MediaSink sink4("sinkId4", "Sink 4", MediaSink::IconType::CAST);
   MediaSink sink5("sinkId5", "Sink 5", MediaSink::IconType::CAST);
+  GURL origin("https://origin.com");
 
   query_result_manager_.AddObserver(&mock_observer_);
   DiscoverSinks(MediaCastMode::DEFAULT,
@@ -166,7 +168,8 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
   sinks_query_result.push_back(sink3);
   EXPECT_CALL(mock_observer_,
               OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
-  sinks_observer_it->second->OnSinksReceived(sinks_query_result);
+  sinks_observer_it->second->OnSinksUpdated(sinks_query_result,
+                                            std::vector<GURL>());

[mark a. foltz, 2016/03/15 00:36:43]

Please use a non-empty origin list for one of these test cases.

[imcheng, 2016/03/15 01:52:42]

Done.

 
   // Action: TAB_MIRROR -> [2, 3, 4]
   // Expected result:
@@ -194,7 +197,8 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
   ASSERT_TRUE(sinks_observer_it->second.get());
   EXPECT_CALL(mock_observer_,
               OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
-  sinks_observer_it->second->OnSinksReceived(sinks_query_result);
+  sinks_observer_it->second->OnSinksUpdated(sinks_query_result,
+                                            std::vector<GURL>());
 
   // Action: Update default presentation URL
   // Expected result:
@@ -214,7 +218,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
               OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
   query_result_manager_.StartSinksQuery(
       MediaCastMode::DEFAULT,
-      MediaSourceForPresentationUrl("http://bazurl.com"));
+      MediaSourceForPresentationUrl("http://bazurl.com"), origin);
 
   // Action: Remove TAB_MIRROR observer
   // Expected result: