[Media Router] Fix one-ua no-receiver integration tests.

- Don't depend on external resources for presentation URLs. Changed the url in the test from https://google.com to a local page. - One-UA no-receiver tests need to fire up a EmbeddedTestServer in order for presentation URLs to resolve to https: scheme. Bug: 840059 Change-Id: If5c4bc7e00b75a37d5df94e05b1ebad49e7cdd67 Reviewed-on: https://chromium-review.googlesource.com/1050885Reviewed-by: Adam Parker <amp@chromium.org> Commit-Queue: Derek Cheng <imcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#557228}

[Media Router] Fix one-ua no-receiver integration tests.
- Don't depend on external resources for presentation URLs. Changed the url in the test from https://google.com to a local page. - One-UA no-receiver tests need to fire up a EmbeddedTestServer in order for presentation URLs to resolve to https: scheme. Bug: 840059 Change-Id: If5c4bc7e00b75a37d5df94e05b1ebad49e7cdd67 Reviewed-on: https://chromium-review.googlesource.com/1050885Reviewed-by: Adam Parker <amp@chromium.org> Commit-Queue: Derek Cheng <imcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#557228}
64233e4a · Derek Cheng · Commit Bot · 959669a6 · 64233e4a · 64233e4a
Commit 64233e4a authored May 09, 2018 by Derek Cheng Committed by Commit Bot May 09, 2018
4 changed files
--- a/chrome/test/media_router/BUILD.gn
+++ b/chrome/test/media_router/BUILD.gn
@@ -36,7 +36,9 @@ source_set("browser_tests") {
    ":browser_test_resources",
    "//chrome/browser/resources/media_router/extension:media_router",
  ]
-  data = [ "$root_gen_dir/chrome/browser/resources/media_router/extension/" ]
+  data = [
+    "$root_gen_dir/chrome/browser/resources/media_router/extension/",
+  ]
 }
 copy("browser_test_resources") {
@@ -50,6 +52,7 @@ copy("browser_test_resources") {
    "resources/fail_reconnect_session.json",
    "resources/local_media_sink.json",
    "resources/local_media_sink_route_fail.json",
+    "resources/no_presentation_receiver.html",
    "resources/no_provider.json",
    "resources/no_sinks.json",
    "resources/no_supported_sinks.json",

--- a/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
+++ b/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
@@ -37,8 +37,7 @@ class MediaRouterIntegrationOneUABrowserTest
  }
  GURL GetTestPageUrl(const base::FilePath& full_path) override {
-    GURL url = embedded_test_server()->GetURL("/basic_test.html");
+    return embedded_test_server()->GetURL("/basic_test.html?__oneUA__=true");
-    return GURL(url.spec() + "?__oneUA__=true");
  }
 };
@@ -80,11 +79,11 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
 }
 class MediaRouterIntegrationOneUANoReceiverBrowserTest
-    : public MediaRouterIntegrationBrowserTest {
+    : public MediaRouterIntegrationOneUABrowserTest {
 public:
  GURL GetTestPageUrl(const base::FilePath& full_path) override {
-    GURL url = MediaRouterIntegrationBrowserTest::GetTestPageUrl(full_path);
+    return embedded_test_server()->GetURL(
-    return GURL(url.spec() + "?__oneUANoReceiver__=true");
+        "/basic_test.html?__oneUANoReceiver__=true");
  }
 };

--- a/chrome/test/media_router/resources/common.js
+++ b/chrome/test/media_router/resources/common.js
@@ -19,7 +19,7 @@ if (params.get('__is_android__') == 'true') {
 } else if (params.get('__oneUA__') == 'true') {
  presentationUrl = "presentation_receiver.html";
 } else if (params.get('__oneUANoReceiver__') == 'true') {
-  presentationUrl = "https://www.google.com";
+  presentationUrl = "no_presentation_receiver.html";
 } else {
  presentationUrl = "test://test";
 }

--- a/chrome/test/media_router/resources/no_presentation_receiver.html
+++ b/chrome/test/media_router/resources/no_presentation_receiver.html
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>Media Router Integration Test - Receiver Page (No navigator.presentation.receiver)</title>
+    <!-- This page is intentionally left empty to test receiver pages that do not use the Presentation Receiver API. -->
+  </head>
+  <body>
+  </body>
+</html>