chrome/test/data/notifications/platform_notification_service.html - Issue 960923004: Add two instrumentation tests for Web Notifications on Android.

Unified Diff: chrome/test/data/notifications/platform_notification_service.html

Issue 960923004: Add two instrumentation tests for Web Notifications on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/test/data/notifications/platform_notification_service.html

diff --git a/chrome/test/data/notifications/platform_notification_service.html b/chrome/test/data/notifications/platform_notification_service.html

index 3fc27dc0c659d24c5ebcb40b343728e16cc8634e..75c15ce2934fd9bee6661e799d10c319f17d3de9 100644

--- a/chrome/test/data/notifications/platform_notification_service.html

+++ b/chrome/test/data/notifications/platform_notification_service.html

@@ -5,8 +5,9 @@

<title>Platform Notification Service BrowserTest service page</title>

</head>

<body>

- <!-- This page is intended to be used by the

+ <!-- This page is intended to be used by the cross-platform

PlatformNotificationServiceBrowserTest. -->

+ <script src="notification_test_utils.js"></script>

var messagePort = null,

messageStack = [],

@@ -20,51 +21,6 @@

});

}

- // Returns a promise that will be resolved with an activated Service

- // Worker, or rejects when the Service Worker could not be started. There

- // will be a message port to and from the worker in |messagePort|.

- // TODO(peter): Generalize this in some sort of Service Worker utility

- // JavaScript file so that other tests can re-use the same logic.

- function GetActivatedServiceWorker(script, scope) {

- return navigator.serviceWorker.getRegistration(scope)

- .then(function (registration) {

- // Unregister any existing Service Worker.

- if (registration)

- return registration.unregister();

- }).then(function () {

- // Register the Service Worker again.

- return navigator.serviceWorker.register(script, { scope: scope });

- }).then(function (registration) {

- if (registration.active) {

- return registration;

- } else if (registration.waiting || registration.installing) {

- var worker = registration.waiting || registration.installing;

- return new Promise(function (resolve) {

- worker.addEventListener('statechange', function () {

- if (worker.state === 'activated')

- resolve(registration);

- });

- } else {

- return Promise.reject('Service Worker in invalid state.');

- }

- }).then(function (registration) {

- return new Promise(function (resolve) {

- var channel = new MessageChannel();

- channel.port1.addEventListener('message', function (event) {

- if (event.data == 'ready')

- resolve(registration);

- });

- registration.active.postMessage(channel.port2,

- [ channel.port2 ]);

- messagePort = channel.port1;

- messagePort.start();

- });

- }

// Renews the registered Service Worker registration for this page, then

// displays a notification on the activated ServiceWorkerRegistration.

function DisplayPersistentNotification(title) {

« chrome/test/data/notifications/android_test_worker.js ('K') | « chrome/test/data/notifications/notification_test_utils.js ('k') | no next file » | no next file with comments »