Pass origin to StartObservingMediaSinks.

chrome/browser/media/router/media_source_helper_unittest.cc

Index: chrome/browser/media/router/media_source_helper_unittest.cc
diff --git a/chrome/browser/media/router/media_source_helper_unittest.cc b/chrome/browser/media/router/media_source_helper_unittest.cc
index e0fbaedafaa59fd5e9e85f44318f237a62243b22..b7133cb1511cf5557327da48f3deee087d791858 100644
--- a/chrome/browser/media/router/media_source_helper_unittest.cc
+++ b/chrome/browser/media/router/media_source_helper_unittest.cc
@@ -15,7 +15,8 @@ TEST(MediaSourcesTest, IsMirroringMediaSource) {
   EXPECT_TRUE(IsMirroringMediaSource(MediaSourceForDesktop()));
   EXPECT_FALSE(IsMirroringMediaSource(MediaSourceForCastApp("CastApp")));
   EXPECT_FALSE(
-      IsMirroringMediaSource(MediaSourceForPresentationUrl("http://url")));
+      IsMirroringMediaSource(MediaSourceForPresentationUrl("http://url",

[mark a. foltz, 2016/03/03 22:58:36]

Nit: Please use valid looking URLs and origins, like

"http://example.com/presentation.html", "http://example.com"

It makes the test easier to understand.

[matt.boetger, 2016/03/04 00:22:10]

Done.

+                                                           "http://url")));
 }
 
 TEST(MediaSourcesTest, CreateMediaSource) {
@@ -26,7 +27,8 @@ TEST(MediaSourcesTest, CreateMediaSource) {
   EXPECT_EQ("urn:x-com.google.cast:application:DEADBEEF",
             MediaSourceForCastApp("DEADBEEF").id());
   EXPECT_EQ("http://example.com/",
-            MediaSourceForPresentationUrl("http://example.com/").id());
+            MediaSourceForPresentationUrl("http://example.com/",
+                                          "http://example.com/").id());
 }
 
 TEST(MediaSourcesTest, IsValidMediaSource) {
@@ -34,16 +36,20 @@ TEST(MediaSourcesTest, IsValidMediaSource) {
   EXPECT_TRUE(IsValidMediaSource(MediaSourceForDesktop()));
   EXPECT_TRUE(IsValidMediaSource(MediaSourceForCastApp("DEADBEEF")));
   EXPECT_TRUE(
-      IsValidMediaSource(MediaSourceForPresentationUrl("http://example.com/")));
+      IsValidMediaSource(MediaSourceForPresentationUrl("http://example.com/",
+                                                       "http://example.com/")));
   EXPECT_TRUE(IsValidMediaSource(
-      MediaSourceForPresentationUrl("https://example.com/")));
+      MediaSourceForPresentationUrl("https://example.com/",
+                                    "http://example.com/")));
 
   // Disallowed scheme
   EXPECT_FALSE(IsValidMediaSource(
-      MediaSourceForPresentationUrl("file:///some/local/path")));
+      MediaSourceForPresentationUrl("file:///some/local/path",
+                                    "file:///some")));
   // Not a URL
   EXPECT_FALSE(
-      IsValidMediaSource(MediaSourceForPresentationUrl("totally not a url")));
+      IsValidMediaSource(MediaSourceForPresentationUrl("totally not a url",
+                                                       "nope")));
 }
 
 TEST(MediaSourcesTest, PresentationUrlFromMediaSource) {
@@ -51,7 +57,8 @@ TEST(MediaSourcesTest, PresentationUrlFromMediaSource) {
   EXPECT_EQ("", PresentationUrlFromMediaSource(MediaSourceForDesktop()));
   EXPECT_EQ("http://example.com/",
             PresentationUrlFromMediaSource(
-                MediaSourceForPresentationUrl("http://example.com/")));
+                MediaSourceForPresentationUrl("http://example.com/",
+                                              "http://example.com")));
 }
 
 }  // namespace media_router