Skip to content

GitLab

T
tangled
Commit 93000cd8 authored by Mugdha Lakhani's avatar Mugdha Lakhani Committed by Commit Bot
Browse files
Options

[Prerender] Delete PrerenderBrowsertest. 

Now that all prerender browsertests have been ported over,
delete the class the unused methods.

Please see this spreadsheet for details:
https://docs.google.com/spreadsheets/d/1LFPB4UhPWQkBRz481lz49zmS25znhjSDUtagtTTSPQo/edit?usp=sharing

Bug: 898955
Change-Id: I069ba05d37e11f40e82d867e32cea2e15e07cdba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307336Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790756}
parent beca13ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1302 deletions
chrome/browser/prerender/prerender_browsertest.cc deleted 100644 → 0
View file @ beca13ec
This diff is collapsed.
chrome/test/BUILD.gn
View file @ 93000cd8
...@@ -1113,7 +1113,6 @@ if (!is_android) { ...@@ -1113,7 +1113,6 @@ if (!is_android) {
"../browser/prerender/isolated/isolated_prerender_browsertest.cc", "../browser/prerender/isolated/isolated_prerender_browsertest.cc",
"../browser/prerender/isolated/isolated_prerender_test_utils.cc", "../browser/prerender/isolated/isolated_prerender_test_utils.cc",
"../browser/prerender/isolated/isolated_prerender_test_utils.h", "../browser/prerender/isolated/isolated_prerender_test_utils.h",
"../browser/prerender/prerender_browsertest.cc",
"../browser/prerender/prerender_nostate_prefetch_browsertest.cc", "../browser/prerender/prerender_nostate_prefetch_browsertest.cc",
"../browser/prerender/prerender_test_utils.cc", "../browser/prerender/prerender_test_utils.cc",
"../browser/prerender/prerender_test_utils.h", "../browser/prerender/prerender_test_utils.h",
......
chrome/test/data/extensions/api_test/webnavigation/prerender/manifest.json deleted 100644 → 0
View file @ beca13ec
{
"name": "webNavigation",
"version": "1.0",
"manifest_version": 2,
"description": "Tests the webNavigation API events - prerender.",
"background": {
"page": "test_prerender.html"
},
"permissions": ["webNavigation", "tabs"]
}
chrome/test/data/prerender/document.doc.mock-http-headers deleted 100644 → 0
View file @ beca13ec
HTTP/1.1 200 OK
Content-Type: application/msword
chrome/test/data/prerender/form_that_posts_to_prerendered_echoall.html deleted 100644 → 0
View file @ beca13ec
<!DOCTYPE html>
<html>
<head>
<link rel="prerender" href="/echoall">
</head>
<body>
<form id="form" method="POST" action="/echoall">
<input type="text" name="text" value="value">
<input type="submit">
</form>
</body>
</html>
chrome/test/data/prerender/image-deferred.png.mock-http-headers deleted 100644 → 0
View file @ beca13ec
HTTP/1.1 302 Found
Location: image.png
Follow-Only-When-Prerender-Shown: 1
chrome/test/data/prerender/prerender_deferred_image.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks to make sure that redirects are deferred.
-->
<head>
<title>Prerender deferred redirect</title>
</head>
<body>
<script>
var imageWasLoaded = false;
var prefix = "";
if (location.hash == "#double_redirect")
prefix = "/server-redirect?";
// Insert a deferred redirect into the document.
var image = new Image();
image.src = prefix + "/prerender/image-deferred.png";
image.onload = function() {
imageWasLoaded = true;
};
document.body.appendChild(image);
// Make sure the image was not loaded while prerendering.
function DidPrerenderPass() {
return !imageWasLoaded;
}
// Make sure the image is loaded once the page is displayed.
function DidDisplayPass() {
return imageWasLoaded;
}
// Wait for a sibling image to load before calling DidPrerenderPass.
// TODO(davidben): Wait on something more reasonable. This should
// still pass reliably, but will only fail flakily on regression.
var image2 = new Image();
image2.src = prefix + "/prerender/image-redirect.png";
image2.onload = function() {
document.title = "READY";
};
document.body.appendChild(image2);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_favicon.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks to make sure that a prerendered page is loaded.
-->
<head>
<link rel="icon" href="favicon.ico">
<title>Prerender Page</title>
<script>
var pageWasPrerendered = false;
// Make sure plugin was not loaded while prerendering.
function DidPrerenderPass() {
pageWasPrerendered = true;
return true;
}
// Make sure DidPrerenderPass() was called first. Otherwise, the page was
// most likely reloaded instead of using the prerendered page.
function DidDisplayPass() {
return pageWasPrerendered;
}
</script>
</head>
<body></body>
</html>
chrome/test/data/prerender/prerender_html5_common.js deleted 100644 → 0
View file @ beca13ec
// Copyright (c) 2012 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.
// Common js for the HTML5_* tests. The following variables need to be defined
// before this js is included:
// - 'willPlay' - indicates if the media is expected to start playing during
// the test.
// - 'testNetworkEvents' - if set to true, the test will test for the
// loadstart and stalled events. NOTE that since the loadstart event fires
// very early, to test for it reliably, the source of the media tag
// should be added after this script is included or add
// 'onLoadStart=mediEventHandler' as an attribute to the media element.
// Also to reliably test the stalled event, the the test should wait for the
// prerendered page's title to change to "READY" before calling
// DidPrerenderPass.
function assert(bool) {
if (!bool)
throw new Error('Assert Failed.');
}
var canPlaySeen = false;
var playingSeen = false;
var canPlayThroughSeen = false;
var loadStartSeen = false;
var stalledSeen = false;
var hasError = false;
assert(typeof(willPlay) != 'undefined');
assert(typeof(testNetworkEvents) != 'undefined');
var mediaEl = document.getElementById("mediaEl");
function mediaEventHandler(e) {
switch (e.type) {
case 'canplay':
canPlaySeen = true;
break;
case 'playing':
assert(canPlaySeen);
playingSeen = true;
break;
case 'canplaythrough':
assert(canPlaySeen);
canPlayThroughSeen = true;
break;
case 'error':
hasError = true;
break;
case 'loadstart':
loadStartSeen = true;
break;
case 'stalled':
assert(loadStartSeen);
stalledSeen = true;
if (testNetworkEvents) {
document.title = 'READY';
}
break;
}
var progressDone = (willPlay && canPlayThroughSeen && playingSeen) ||
(!willPlay && canPlayThroughSeen && !playingSeen);
if (progressDone)
document.title = 'PASS';
}
mediaEl.addEventListener('playing', mediaEventHandler, false);
mediaEl.addEventListener('canplay', mediaEventHandler, false);
mediaEl.addEventListener('canplaythrough', mediaEventHandler, false);
mediaEl.addEventListener('error', mediaEventHandler, false);
if (testNetworkEvents) {
mediaEl.addEventListener('stalled', mediaEventHandler, false);
mediaEl.addEventListener('loadstart', mediaEventHandler, false);
}
// TODO(shishir): Remove this once http://crbug.com/130788 is fixed.
function printDebugInfo() {
console.log("\ncanPlaySeen: " + canPlaySeen);
console.log("playingSeen: " + playingSeen);
console.log("canPlayThroughSeen: " + canPlayThroughSeen);
console.log("loadStartSeen: " + loadStartSeen);
console.log("stalledSeen: " + stalledSeen);
console.log("hasError: " + hasError + "\n");
}
setInterval(printDebugInfo, 5000);
function DidPrerenderPass() {
// The media should not have started at this point.
return !canPlaySeen && !playingSeen && !hasError &&
mediaEl.currentTime == 0 &&
mediaEl.readyState == mediaEl.HAVE_NOTHING &&
(!testNetworkEvents || stalledSeen);
}
function DidDisplayPass() {
// The actual test is done via the TitleWatcher.
return true;
}
chrome/test/data/prerender/prerender_html5_video_media_source.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks that video tags created by javascript are are deferred
during prerendering and the autoplay is enabled during swap ins.
-->
<head>
<title>Prerender for HTML5 Media Source Video.</title>
</head>
<body>
<video id="mediaEl" autoplay controls></video>
<script>
var willPlay = true;
var testNetworkEvents = false;
</script>
<script src="prerender_html5_common.js"></script>
<script>
function onSourceOpen(e) {
var srcBuffer = mediaSource.addSourceBuffer('video/webm; codecs="vp8"');
var xhr = new XMLHttpRequest();
xhr.open('GET', 'bear-320x240-video-only.webm');
xhr.responseType = 'arraybuffer';
xhr.addEventListener('load', function(e) {
srcBuffer.appendBuffer(new Uint8Array(e.target.response));
srcBuffer.addEventListener('updateend', function(e) {
mediaSource.endOfStream();
});
});
xhr.send();
}
var mediaSource = new MediaSource();
mediaSource.addEventListener('sourceopen', onSourceOpen);
mediaEl.src = window.URL.createObjectURL(mediaSource);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
</head>
<body>
<script>
var numLinksToInsert =
ExtractGetParameterBadlyAndInsecurely('links_to_insert', 1);
for (var i = 0; i < numLinksToInsert; ++i) {
AddPrerender('REPLACE_WITH_PRERENDER_URL', i);
}
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader_with_beforeunload.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
<script>
function BeforeUnloadHandler() {
// Notify with XHR the RequestCounter that the handler has been executed.
// The request must be async in order to be allowed in a beforeunload
// handler.
var xhr = new XMLHttpRequest();
xhr.open('GET', '/unload-url', true);
xhr.send();
}
addEventListener('beforeunload', BeforeUnloadHandler, false);
</script>
</head>
<body>
<script>
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader_with_hanging_unload.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
<script>
function UnloadHandler() {
// Signal to the browser the unload happened by hitting a URL. Must
// be synchronous so the request isn't cancelled.
var xhr = new XMLHttpRequest();
xhr.open('GET', '/hung', false);
xhr.send();
}
addEventListener('unload', UnloadHandler, false);
</script>
</head>
<body>
<script>
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader_with_referrer_policy.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
<meta name="referrer" content="origin" />
</head>
<body>
<script>
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader_with_replace_state.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
</head>
<body>
<script>
history.replaceState(null, "Preloader", "/");
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_loader_with_unload.html deleted 100644 → 0
View file @ beca13ec
<html>
<head>
<title>Preloader</title>
<script src="prerender_events_common.js"></script>
<script>
function UnloadHandler() {
// Signal to the browser the unload happened by hitting a URL. Must
// not be cancelled.
fetch('/unload-url', {method: 'GET', keepalive: true});
}
addEventListener('unload', UnloadHandler, false);
</script>
</head>
<body>
<script>
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
chrome/test/data/prerender/prerender_localstorage_read.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks to make sure that a page that reads from localstorage fails to
prerender.
-->
<head>
<title>Prerender local storage read</title>
<script>
window.localStorage.getItem("prerender_test");
var pageWasPrerendered = false;
// Make sure plugin was not loaded while prerendering.
function DidPrerenderPass() {
pageWasPrerendered = true;
return true;
}
// Make sure DidPrerenderPass() was called first. Otherwise, the page was
// most likely reloaded instead of using the prerendered page.
function DidDisplayPass() {
return pageWasPrerendered;
}
</script>
</head>
<body></body>
</html>
chrome/test/data/prerender/prerender_localstorage_write.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks to make sure that a page that writes to localstorage fails to
prerender.
-->
<head>
<title>Prerender local storage write</title>
<script>
window.localStorage.removeItem("prerender_test");
window.localStorage.setItem("prerender_test", "foo");
var pageWasPrerendered = false;
// Make sure plugin was not loaded while prerendering.
function DidPrerenderPass() {
pageWasPrerendered = true;
return true;
}
// Make sure DidPrerenderPass() was called first. Otherwise, the page was
// most likely reloaded instead of using the prerendered page.
function DidDisplayPass() {
var foo = window.localStorage.getItem("prerender_test");
return pageWasPrerendered && foo === "foo";
}
</script>
</head>
<body></body>
</html>
chrome/test/data/prerender/prerender_page_removes_pending.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test checks to make sure that pending prerenders which are canceled
while pending never start.
-->
<link id=thePrerender rel=prerender href="does_not_exist.html" />
<head>
<title>Prerender Page</title>
<script src="prerender_events_common.js"></script>
<script>
var pageWasPrerendered = false;
function DidPrerenderPass() {
pageWasPrerendered = true;
var link = document.getElementById('thePrerender');
if (link)
link.parentElement.removeChild(link)
return !GetPrerenderEventCount(0, 'webkitprerenderstart');
}
// Make sure DidPrerenderPass() was called first. Otherwise, the page was
// most likely reloaded instead of using the prerendered page.
function DidDisplayPass() {
return pageWasPrerendered &&
!GetPrerenderEventCount(0, 'webkitprerenderstart');
}
var link = document.getElementById('thePrerender');
AddEventHandlersToLinkElement(link, 0);
</script>
</head>
<body></body>
</html>
chrome/test/data/prerender/prerender_plugin_nacl_enabled.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
Make sure prerendered page load NaCl plugins when it's enabled.
-->
<head>
<title>Prerender NaCl Enabled</title>
</head>
<body>
<script>
var readyToSendResult = false;
var pluginLoadStarted = false;
/**
* Sends true if |readyToSendResult| and |pluginLoadStarted| are both true.
* Otherwise, does nothing.
*/
function sendResult() {
if (!readyToSendResult || !pluginLoadStarted)
return;
window.domAutomationController.send(true);
readyToSendResult = false;
}
function eventListener(event) {
var targetElement = event.target;
if (event.target.id != 'naclPlugin')
return;
pluginLoadStarted = true;
sendResult();
}
document.body.addEventListener('loadstart', eventListener, true);
function DidPrerenderPass() {
return !pluginLoadStarted;
}
function DidDisplayPass() {
return true;
}
/**
* It's possible for DidDisplayPass to be called before the loadstart event
* happens, since the loadstart event is posted asynchronously when a plugin
* loads. As a result, we need to wait until we've seen both the loadstart
* event and been called from the browser process before we can safely send
* the real result.
*/
function DidDisplayReallyPass() {
readyToSendResult = true;
sendResult();
}
</script>
<embed id="naclPlugin" type="application/x-nacl" src="dummy.nmf"></embed>
</body>
</html>
chrome/test/data/prerender/prerender_referrer_policy.html deleted 100644 → 0
View file @ beca13ec
<html>
<!--
This test makes sure that referrer is properly set.
-->
<head>
<title>Prerender Referrer Test</title>
<script>
// Check referrer.
function DidPrerenderPass() {
return document.referrer != "" &&
document.referrer.indexOf("prerender_loader") == -1;
}
// Check referrer.
function DidDisplayPass() {
return document.referrer != "" &&
document.referrer.indexOf("prerender_loader") == -1;
}
</script>
</head>
<body></body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment