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

chrome/test/media_router/media_router_e2e_browsertest.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 "chrome/test/media_router/media_router_e2e_browsertest.h"
 
 #include <vector>
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/route_request_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "media/base/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
-
+#include "url/origin.h"
 
 // Use the following command to run e2e browser tests:
 // ./out/Debug/browser_tests --user-data-dir=<empty user data dir>
 //   --extension-unpacked=<mr extension dir>
 //   --receiver=<chromecast device name>
 //   --enable-pixel-output-in-tests --run-manual
 //   --gtest_filter=MediaRouterE2EBrowserTest.<test case name>
 //   --enable-logging=stderr
 //   --whitelisted-extension-id=enhhojjnijigcajfphajepfemndkmdlo
 //   --ui-test-action-timeout=200000
 //   --media-router=1
 
 namespace {
 // URL to launch Castv2Player_Staging app on Chromecast
 const char kCastAppPresentationUrl[] =
     "https://google.com/cast#__castAppId__=BE6E4473/"
     "__castClientId__=143692175507258981";
 const char kVideo[] = "video";
 const char kBearVP9Video[] = "bear-vp9-opus.webm";
 const char kPlayer[] = "player.html";
-const char kOriginUrl[] = "http://origin/";
+const url::Origin kOrigin = url::Origin(GURL("http://origin/"));

[mark a. foltz, 2017/01/17 21:30:45]

Ditto

[steimel, 2017/01/18 01:52:35]

Done.

 }  // namespace
 
 
 namespace media_router {
 
 MediaRouterE2EBrowserTest::MediaRouterE2EBrowserTest()
     : media_router_(nullptr) {
 }
 
 MediaRouterE2EBrowserTest::~MediaRouterE2EBrowserTest() {
@@ skipping 14 matching lines @@
 }
 
 void MediaRouterE2EBrowserTest::OnRouteResponseReceived(
     const RouteRequestResult& result) {
   ASSERT_TRUE(result.route());
   route_id_ = result.route()->media_route_id();
 }
 
 void MediaRouterE2EBrowserTest::CreateMediaRoute(
     const MediaSource& source,
-    const GURL& origin,
+    const url::Origin& origin,
     content::WebContents* web_contents) {
   DCHECK(media_router_);
   observer_.reset(new TestMediaSinksObserver(media_router_, source, origin));
   observer_->Init();
 
   DVLOG(1) << "Receiver name: " << receiver();
   // Wait for MediaSinks compatible with |source| to be discovered.
   ASSERT_TRUE(ConditionalWait(
       base::TimeDelta::FromSeconds(30), base::TimeDelta::FromSeconds(1),
       base::Bind(&MediaRouterE2EBrowserTest::IsSinkDiscovered,
@@ skipping 48 matching lines @@
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), GURL("about:blank"), 1);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   int tab_id = SessionTabHelper::IdForTab(web_contents);
 
   // Wait for 30 seconds to make sure the route is stable.
-  CreateMediaRoute(
-      MediaSourceForTab(tab_id), GURL(kOriginUrl), web_contents);
+  CreateMediaRoute(MediaSourceForTab(tab_id), kOrigin, web_contents);
   Wait(base::TimeDelta::FromSeconds(30));
 
   // Wait for 10 seconds to make sure route has been stopped.
   StopMediaRoute();
   Wait(base::TimeDelta::FromSeconds(10));
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_CastApp) {
   // Wait for 30 seconds to make sure the route is stable.
   CreateMediaRoute(MediaSourceForPresentationUrl(GURL(kCastAppPresentationUrl)),
-                   GURL(kOriginUrl), nullptr);
+                   kOrigin, nullptr);
   Wait(base::TimeDelta::FromSeconds(30));
 
   // Wait for 10 seconds to make sure route has been stopped.
   StopMediaRoute();
   Wait(base::TimeDelta::FromSeconds(10));
 }
 
 }  // namespace media_router