| Index: chrome/test/data/extensions/platform_apps/ad_view/display_first_ad/chrometest.js
|
| diff --git a/chrome/test/data/extensions/platform_apps/ad_view/display_first_ad/chrometest.js b/chrome/test/data/extensions/platform_apps/ad_view/display_first_ad/chrometest.js
|
| index de95a6c094fd872b1960e400418341dcfc869502..d5dab085b0f7985ef044582de88249458be6571f 100644
|
| --- a/chrome/test/data/extensions/platform_apps/ad_view/display_first_ad/chrometest.js
|
| +++ b/chrome/test/data/extensions/platform_apps/ad_view/display_first_ad/chrometest.js
|
| @@ -1,25 +1,38 @@
|
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 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.
|
|
|
| -chrome.test.getConfig(function(config) {
|
| - var guestURL = 'http://localhost:' + config.testServer.port +
|
| - '/files/extensions/platform_apps/ad_view/ad_network/testsdk.html';
|
| - var adview = document.getElementsByTagName("adview")[0];
|
| +// This test checks the page running inside an <adview> has the ability to load
|
| +// and display an image inside an <iframe>.
|
|
|
| - adview.addEventListener("loadcommit", function() {
|
| - adview.contentWindow.postMessage({
|
| - message: "display-first-ad",
|
| - publisherData: "data"
|
| - }, "*");
|
| - })
|
| +function runTests(guestURL) {
|
| + chrome.test.runTests([
|
| + function test() {
|
| + var adview = document.getElementsByTagName("adview")[0];
|
|
|
| - window.addEventListener("message", function(event) {
|
| - if (event.data.message == "ad-displayed") {
|
| - console.log("ad-displayed: " + event.data.data.adSize.height);
|
| - chrome.test.sendMessage("ad-displayed");
|
| + adview.addEventListener("loadcommit", function() {
|
| + adview.contentWindow.postMessage({
|
| + message: "display-first-ad",
|
| + publisherData: "data"
|
| + }, "*");
|
| + })
|
| +
|
| + window.addEventListener("message", function(event) {
|
| + if (event.data.message == "ad-displayed") {
|
| + console.log("ad-displayed: " + event.data.data.adSize.height);
|
| + chrome.test.succeed();
|
| + }
|
| + })
|
| +
|
| + adview.setAttribute("src", guestURL);
|
| }
|
| - })
|
| + ]);
|
| +}
|
|
|
| - adview.setAttribute("src", guestURL);
|
| -});
|
| +window.onload = function() {
|
| + chrome.test.getConfig(function(config) {
|
| + var guestURL = 'http://localhost:' + config.testServer.port +
|
| + '/files/extensions/platform_apps/ad_view/ad_network_site/testsdk.html';
|
| + runTests(guestURL);
|
| + });
|
| +}
|
|
|