Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: chrome/test/data/extensions/api_test/executescript/in_frame/test.html

Issue 8758008: Move another block of extension tests to manifest_version 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/extensions/api_test/executescript/in_frame/test.html
===================================================================
--- chrome/test/data/extensions/api_test/executescript/in_frame/test.html (revision 112170)
+++ chrome/test/data/extensions/api_test/executescript/in_frame/test.html (working copy)
@@ -1,71 +1,6 @@
-<script>
-
-var pass = chrome.test.callbackPass;
-var fail = chrome.test.callbackFail;
-var assertEq = chrome.test.assertEq;
-var assertTrue = chrome.test.assertTrue;
-var relativePath =
- '/files/extensions/api_test/executescript/in_frame/test_executescript.html';
-var testUrl = 'http://a.com:PORT' + relativePath;
-
-chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
- if (changeInfo.status != 'complete')
- return;
-
- chrome.test.runTests([
- function executeJavaScriptCodeInAllFramesShouldSucceed() {
- var script_file = {};
- script_file.code = "var extensionPort = chrome.extension.connect();";
- script_file.code = script_file.code +
- "extensionPort.postMessage({message: document.title});";
- script_file.allFrames = true;
- var counter = 0;
- var totalTitles = '';
- function eventListener(port) {
- port.onMessage.addListener(function(data) {
- counter++;
- totalTitles += data.message;
- });
- };
- chrome.self.onConnect.addListener(eventListener);
- chrome.tabs.executeScript(tabId, script_file, pass(function() {
- assertEq(counter, 5);
- assertEq(totalTitles, 'frametest0test1test2test3');
- chrome.self.onConnect.removeListener(eventListener);
- }));
- },
-
- function insertCSSTextInAllFramesShouldSucceed() {
- var css_file = {};
- css_file.code = "p {display:none;}";
- css_file.allFrames = true;
- var newStyle = '';
- var counter = 0;
- function eventListener(port) {
- port.onMessage.addListener(function(data) {
- counter++;
- newStyle += data.message;
- });
- };
- chrome.self.onConnect.addListener(eventListener);
- chrome.tabs.insertCSS(tabId, css_file, function() {
- var script_file = {};
- script_file.file = 'script.js';
- script_file.allFrames = true;
- chrome.tabs.executeScript(tabId, script_file,
- pass(function() {
- assertEq(newStyle, 'nonenonenonenone');
- assertEq(counter, 4);
- chrome.self.onConnect.removeListener(eventListener);
- }));
- });
- }
- ]);
-});
-
-chrome.test.getConfig(function(config) {
- testUrl = testUrl.replace(/PORT/, config.testServer.port);
- chrome.tabs.create({ url: testUrl });
-});
-
-</script>
+<!--
+ * Copyright (c) 2011 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.
+-->
+<script src="test.js"></script>

Powered by Google App Engine
This is Rietveld 408576698