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

Unified Diff: chrome/test/data/extensions/api_test/messaging/connect_crash/test.js

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/:/ / Created 4 years, 11 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/extensions/api_test/messaging/connect_crash/test.js
diff --git a/chrome/test/data/extensions/api_test/messaging/connect_nobackground/test.js b/chrome/test/data/extensions/api_test/messaging/connect_crash/test.js
similarity index 50%
copy from chrome/test/data/extensions/api_test/messaging/connect_nobackground/test.js
copy to chrome/test/data/extensions/api_test/messaging/connect_crash/test.js
index af1732f0f16a344f1c1b6705f0962dea150a2ed5..dbb865d112636e579aa61faf1370a032a8c2122c 100644
--- a/chrome/test/data/extensions/api_test/messaging/connect_nobackground/test.js
+++ b/chrome/test/data/extensions/api_test/messaging/connect_crash/test.js
@@ -3,33 +3,25 @@
// found in the LICENSE file.
chrome.runtime.onConnect.addListener(function(port) {
+ var is_ready_to_crash = false;
var succeed1 = chrome.test.callbackAdded();
var succeed2 = chrome.test.callbackAdded();
- var succeed3 = chrome.test.callbackAdded();
port.onMessage.addListener(function(msg) {
- chrome.test.log('port.onMessage was triggered.');
- chrome.test.assertEq('Hello from content script', msg);
- succeed1();
+ chrome.test.assertEq('is_ready_to_crash', msg);
+ is_ready_to_crash = true;
+ chrome.test.sendMessage('ready_to_crash');
+ // Now the browser test should kill the tab, and the port should be closed.
});
-
port.onDisconnect.addListener(function() {
chrome.test.log('port.onDisconnect was triggered.');
- succeed2();
+ chrome.test.assertTrue(is_ready_to_crash);
+ succeed1();
});
- chrome.tabs.sendMessage(port.sender.tab.id, 'msg from tab', function(reply) {
+ chrome.tabs.sendMessage(port.sender.tab.id, 'Rob says hi', function() {
chrome.test.log('tab.sendMessage\'s response callback was invoked');
- chrome.test.assertEq('Reply here', reply);
- succeed3();
- });
-});
-
-chrome.test.getConfig(function(config) {
- var url = 'http://localhost:' + config.testServer.port +
- '/extensions/test_file.html?will_test_connect_and_sendMessage';
- // Content script will try to connect and trigger onConnect.
- chrome.tabs.create({
- url: url
+ chrome.test.assertNoLastError();
+ succeed2();
});
});

Powered by Google App Engine
This is Rietveld 408576698