Convert MediaRouter mojom apis to intake url::Origin objects instead of strings

chrome/browser/media/router/mock_media_router.h

Index: chrome/browser/media/router/mock_media_router.h
diff --git a/chrome/browser/media/router/mock_media_router.h b/chrome/browser/media/router/mock_media_router.h
index f2d6ae4f3609af5601059d20498fcadf216b2b08..5fe951bdc5edca876ab4cfdeb1536b96e52396fd 100644
--- a/chrome/browser/media/router/mock_media_router.h
+++ b/chrome/browser/media/router/mock_media_router.h
@@ -16,6 +16,7 @@
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "url/origin.h"

[mark a. foltz, 2017/01/24 04:04:17]

Remove #include; I think you can just inherit the forward declaration from
media_router.h

[steimel, 2017/01/25 19:01:11]

It needs the #include for the mock methods

 
 namespace media_router {
 
@@ -28,7 +29,7 @@ class MockMediaRouter : public MediaRouterBase {
   MOCK_METHOD7(CreateRoute,
                void(const MediaSource::Id& source,
                     const MediaSink::Id& sink_id,
-                    const GURL& origin,
+                    const url::Origin& origin,
                     content::WebContents* web_contents,
                     const std::vector<MediaRouteResponseCallback>& callbacks,
                     base::TimeDelta timeout,
@@ -36,7 +37,7 @@ class MockMediaRouter : public MediaRouterBase {
   MOCK_METHOD7(JoinRoute,
                void(const MediaSource::Id& source,
                     const std::string& presentation_id,
-                    const GURL& origin,
+                    const url::Origin& origin,
                     content::WebContents* web_contents,
                     const std::vector<MediaRouteResponseCallback>& callbacks,
                     base::TimeDelta timeout,
@@ -44,7 +45,7 @@ class MockMediaRouter : public MediaRouterBase {
   MOCK_METHOD7(ConnectRouteByRouteId,
                void(const MediaSource::Id& source,
                     const MediaRoute::Id& route_id,
-                    const GURL& origin,
+                    const url::Origin& origin,
                     content::WebContents* web_contents,
                     const std::vector<MediaRouteResponseCallback>& callbacks,
                     base::TimeDelta timeout,