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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js

Issue 2385363002: Pass the RenderProcessHost id on retargeting. (Closed)
Patch Set: Address review feedback and compile problem. Created 4 years, 2 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
« no previous file with comments | « chrome/test/data/extensions/api_test/webnavigation/userAction/subframe.html ('k') | components/renderer_context_menu/render_view_context_menu_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js b/chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js
index 8aa34bd4ab606a2953ddcdeb45b09a08411cb132..aa98733b5fe22c1723a67ee3f5934f8141b265cb 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/userAction/test_userAction.js
@@ -4,92 +4,137 @@
onload = function() {
var getURL = chrome.extension.getURL;
+ var URL_MAIN = getURL("a.html");
+ var SUBFRAME_URL =
+ "http://127.0.0.1:PORT/extensions/api_test/webnavigation/userAction/subframe.html";
+
chrome.tabs.create({"url": "about:blank"}, function(tab) {
var tabId = tab.id;
- chrome.test.runTests([
- // Opens a tab and waits for the user to click on a link in it.
- function userAction() {
- expect([
- { label: "a-onBeforeNavigate",
- event: "onBeforeNavigate",
- details: { frameId: 0,
- parentFrameId: -1,
- processId: -1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('a.html') }},
- { label: "a-onCommitted",
- event: "onCommitted",
- details: { frameId: 0,
- processId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "typed",
- url: getURL('a.html') }},
- { label: "a-onDOMContentLoaded",
- event: "onDOMContentLoaded",
- details: { frameId: 0,
- processId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('a.html') }},
- { label: "a-onCompleted",
- event: "onCompleted",
- details: { frameId: 0,
- processId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('a.html') }},
- { label: "b-onCreatedNavigationTarget",
- event: "onCreatedNavigationTarget",
- details: { sourceFrameId: 0,
- sourceProcessId: 0,
- sourceTabId: 0,
- tabId: 1,
- timeStamp: 0,
- url: getURL('b.html') }},
- { label: "b-onBeforeNavigate",
- event: "onBeforeNavigate",
- details: { frameId: 0,
- parentFrameId: -1,
- processId: -1,
- tabId: 1,
- timeStamp: 0,
- url: getURL('b.html') }},
- { label: "b-onCommitted",
- event: "onCommitted",
- details: { frameId: 0,
- processId: 0,
- tabId: 1,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('b.html') }},
- { label: "b-onDOMContentLoaded",
- event: "onDOMContentLoaded",
- details: { frameId: 0,
- processId: 0,
- tabId: 1,
- timeStamp: 0,
- url: getURL('b.html') }},
- { label: "b-onCompleted",
- event: "onCompleted",
- details: { frameId: 0,
- processId: 0,
- tabId: 1,
- timeStamp: 0,
- url: getURL('b.html') }}],
- [ navigationOrder("a-"),
- navigationOrder("b-"),
- [ "a-onDOMContentLoaded",
- "b-onCreatedNavigationTarget",
- "b-onBeforeNavigate" ]]);
+ chrome.test.getConfig(function(config) {
+ var fixPort = function(url) {
+ return url.replace(/PORT/g, config.testServer.port);
+ };
+ SUBFRAME_URL = fixPort(SUBFRAME_URL);
+
+ chrome.test.runTests([
+ // Opens a tab and waits for the user to click on a link in it.
+ function userAction() {
+ expect([
+ { label: "a-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ parentFrameId: -1,
+ processId: -1,
+ tabId: 0,
+ timeStamp: 0,
+ url: URL_MAIN }},
+ { label: "a-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "typed",
+ url: URL_MAIN }},
+ { label: "a-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: URL_MAIN }},
+ { label: "a-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: URL_MAIN }},
+
+ { label: "subframe-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ parentFrameId: 0,
+ processId: -1,
+ tabId: 0,
+ timeStamp: 0,
+ url: SUBFRAME_URL }},
+ { label: "subframe-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ processId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: SUBFRAME_URL }},
+ { label: "subframe-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ processId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: SUBFRAME_URL }},
+ { label: "subframe-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ processId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: SUBFRAME_URL }},
+
+ { label: "b-onCreatedNavigationTarget",
+ event: "onCreatedNavigationTarget",
+ details: { sourceFrameId: 1,
+ sourceProcessId: 0,
+ sourceTabId: 0,
+ tabId: 1,
+ timeStamp: 0,
+ url: getURL('b.html') }},
+ { label: "b-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ parentFrameId: -1,
+ processId: -1,
+ tabId: 1,
+ timeStamp: 0,
+ url: getURL('b.html') }},
+ { label: "b-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 1,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('b.html') }},
+ { label: "b-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 1,
+ timeStamp: 0,
+ url: getURL('b.html') }},
+ { label: "b-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ processId: 0,
+ tabId: 1,
+ timeStamp: 0,
+ url: getURL('b.html') }}],
+ [ navigationOrder("a-"),
+ navigationOrder("subframe-"),
+ navigationOrder("b-"),
+ [ "a-onCompleted",
+ "b-onCreatedNavigationTarget",
+ "b-onBeforeNavigate" ]]);
- // Notify the api test that we're waiting for the user.
- chrome.test.notifyPass();
- },
- ]);
+ // Notify the api test that we're waiting for the user.
+ chrome.test.notifyPass();
+ },
+ ]);
+ });
});
};
« no previous file with comments | « chrome/test/data/extensions/api_test/webnavigation/userAction/subframe.html ('k') | components/renderer_context_menu/render_view_context_menu_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698