From 0c24e342443934393d8acb99cceeff264db8ff1e Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Mon, 23 Jul 2012 13:17:26 +0000 Subject: Send the correct process ID with webNavigation events BUG=136090 TEST=browser_tests:*WebNavigation* Review URL: https://chromiumcodereview.appspot.com/10815051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147847 0039d316-1c4b-4281-b951-d872f2087c98 --- .../api/web_navigation/web_navigation_api.cc | 24 +++++-------- .../web_navigation/web_navigation_api_helpers.cc | 8 ++--- .../web_navigation/web_navigation_api_helpers.h | 2 ++ .../extensions/api_test/webnavigation/framework.js | 16 ++++++--- .../api_test/webnavigation/test_clientRedirect.js | 10 +++++- .../api_test/webnavigation/test_failures.js | 22 ++++++++++++ .../api_test/webnavigation/test_forwardBack.js | 14 +++++++- .../api_test/webnavigation/test_history.js | 5 +++ .../api_test/webnavigation/test_iframe.js | 40 ++++++++++++++++++++++ .../api_test/webnavigation/test_openTab.js | 24 ++++++++++++- .../api_test/webnavigation/test_prerender.js | 8 +++++ .../webnavigation/test_referenceFragment.js | 7 +++- .../api_test/webnavigation/test_requestOpenTab.js | 11 +++++- .../api_test/webnavigation/test_serverRedirect.js | 4 +++ .../api_test/webnavigation/test_simpleLoad.js | 6 +++- .../api_test/webnavigation/test_targetBlank.js | 9 +++++ .../api_test/webnavigation/test_userAction.js | 11 +++++- 17 files changed, 190 insertions(+), 31 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 7dada01..a21a6ea 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -22,6 +22,7 @@ #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "net/base/net_errors.h" @@ -302,19 +303,6 @@ void WebNavigationTabObserver::DidStartProvisionalLoadForFrame( render_view_host != pending_render_view_host_) return; - // TODO(jochen): Remove this hack once we properly include the process ID in - // the events. - // Ignore navigations of sub frames, if the main frame isn't committed yet. - // This might happen if a sub frame triggers a navigation for both the main - // frame and itself. Since the sub frame is about to be deleted, and there's - // no way for an extension to tell that these navigations belong to an old - // frame, we just suppress the events here. - int64 main_frame_id = navigation_state_.GetMainFrameID(); - if (!is_main_frame && - !navigation_state_.GetNavigationCommitted(main_frame_id)) { - return; - } - navigation_state_.TrackFrame(frame_id, validated_url, is_main_frame, @@ -323,7 +311,8 @@ void WebNavigationTabObserver::DidStartProvisionalLoadForFrame( return; helpers::DispatchOnBeforeNavigate( - web_contents(), frame_id, is_main_frame, validated_url); + web_contents(), render_view_host->GetProcess()->GetID(), frame_id, + is_main_frame, validated_url); } void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame( @@ -406,7 +395,8 @@ void WebNavigationTabObserver::DidFailProvisionalLoad( navigation_state_.SetErrorOccurredInFrame(frame_id); helpers::DispatchOnErrorOccurred( - web_contents(), validated_url, frame_id, is_main_frame, error_code); + web_contents(), render_view_host->GetProcess()->GetID(), validated_url, + frame_id, is_main_frame, error_code); } void WebNavigationTabObserver::DocumentLoadedInFrame( @@ -453,7 +443,8 @@ void WebNavigationTabObserver::DidFailLoad( return; navigation_state_.SetErrorOccurredInFrame(frame_id); helpers::DispatchOnErrorOccurred( - web_contents(), validated_url, frame_id, is_main_frame, error_code); + web_contents(), render_view_host->GetProcess()->GetID(), validated_url, + frame_id, is_main_frame, error_code); } void WebNavigationTabObserver::DidOpenRequestedURL( @@ -493,6 +484,7 @@ void WebNavigationTabObserver::WebContentsDestroyed(content::WebContents* tab) { navigation_state_.CanSendEvents(*frame)) { helpers::DispatchOnErrorOccurred( tab, + tab->GetRenderViewHost()->GetProcess()->GetID(), navigation_state_.GetUrl(*frame), *frame, navigation_state_.IsMainFrame(*frame), diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc index 714de23..4614d75 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc @@ -59,6 +59,7 @@ int GetFrameId(bool is_main_frame, int64 frame_id) { // Constructs and dispatches an onBeforeNavigate event. void DispatchOnBeforeNavigate(content::WebContents* web_contents, + int render_process_id, int64 frame_id, bool is_main_frame, const GURL& validated_url) { @@ -66,8 +67,7 @@ void DispatchOnBeforeNavigate(content::WebContents* web_contents, DictionaryValue* dict = new DictionaryValue(); dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents)); dict->SetString(keys::kUrlKey, validated_url.spec()); - dict->SetInteger(keys::kProcessIdKey, - web_contents->GetRenderViewHost()->GetProcess()->GetID()); + dict->SetInteger(keys::kProcessIdKey, render_process_id); dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id)); dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); @@ -189,6 +189,7 @@ void DispatchOnCreatedNavigationTarget( // Constructs and dispatches an onErrorOccurred event. void DispatchOnErrorOccurred(content::WebContents* web_contents, + int render_process_id, const GURL& url, int64 frame_id, bool is_main_frame, @@ -197,8 +198,7 @@ void DispatchOnErrorOccurred(content::WebContents* web_contents, DictionaryValue* dict = new DictionaryValue(); dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents)); dict->SetString(keys::kUrlKey, url.spec()); - dict->SetInteger(keys::kProcessIdKey, - web_contents->GetRenderViewHost()->GetProcess()->GetID()); + dict->SetInteger(keys::kProcessIdKey, render_process_id); dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id)); dict->SetString(keys::kErrorKey, net::ErrorToString(error_code)); dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h index cadafcc..3a23071 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h @@ -26,6 +26,7 @@ int GetFrameId(bool is_main_frame, int64 frame_id); // Create and dispatch the various events of the webNavigation API. void DispatchOnBeforeNavigate(content::WebContents* web_contents, + int render_process_id, int64 frame_id, bool is_main_frame, const GURL& validated_url); @@ -56,6 +57,7 @@ void DispatchOnCreatedNavigationTarget( const GURL& target_url); void DispatchOnErrorOccurred(content::WebContents* web_contents, + int render_process_id, const GURL& url, int64 frame_id, bool is_main_frame, diff --git a/chrome/test/data/extensions/api_test/webnavigation/framework.js b/chrome/test/data/extensions/api_test/webnavigation/framework.js index 709df2c..5652dc1 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/framework.js @@ -10,6 +10,8 @@ var nextFrameId; var frameIds; var nextTabId; var tabIds; +var nextProcessId; +var processIds; var initialized = false; function deepCopy(obj) { @@ -48,6 +50,8 @@ function expect(data, order) { frameIds = {}; nextTabId = 0; tabIds = {}; + nextProcessId = 0; + processIds = {} initListeners(); } @@ -130,13 +134,17 @@ function captureEvent(name, details) { } details.replacedTabId = tabIds[details.replacedTabId]; } - // Don't bother testing those before we don't correctly dispatch events for - // cross process navigations. if ('processId' in details) { - delete details.processId; + if (processIds[details.processId] === undefined) { + processIds[details.processId] = nextProcessId++; + } + details.processId = processIds[details.processId]; } if ('sourceProcessId' in details) { - delete details.sourceProcessId; + if (processIds[details.sourceProcessId] === undefined) { + processIds[details.sourceProcessId] = nextProcessId++; + } + details.sourceProcessId = processIds[details.sourceProcessId]; } // find |details| in expectedEventData diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_clientRedirect.js b/chrome/test/data/extensions/api_test/webnavigation/test_clientRedirect.js index 79082c8..72534c4 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_clientRedirect.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_clientRedirect.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -13,12 +13,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -27,24 +29,28 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/a.html') }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["client_redirect"], @@ -53,12 +59,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('clientRedirect/b.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_failures.js b/chrome/test/data/extensions/api_test/webnavigation/test_failures.js index 62183c7..357b149 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_failures.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_failures.js @@ -14,6 +14,7 @@ function runTests() { { label: "onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/nonexistant.html') }}, @@ -21,6 +22,7 @@ function runTests() { event: "onErrorOccurred", details: { error: "net::ERR_FILE_NOT_FOUND", frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/nonexistant.html') }}], @@ -34,12 +36,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/d.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -48,18 +52,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/d.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/d.html') }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/c.html') }}, @@ -67,6 +74,7 @@ function runTests() { event: "onErrorOccurred", details: { error: "net::ERR_FILE_NOT_FOUND", frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/c.html') }}], @@ -82,12 +90,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -96,24 +106,28 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/a.html') }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -122,18 +136,21 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/b.html') }}, { label: "c-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/c.html') }}, @@ -141,6 +158,7 @@ function runTests() { event: "onErrorOccurred", details: { error: "net::ERR_FILE_NOT_FOUND", frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/c.html') }}], @@ -158,12 +176,14 @@ function runTests() { { label: "onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/e.html') }}, { label: "onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -172,6 +192,7 @@ function runTests() { { label: "onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/e.html') }}, @@ -179,6 +200,7 @@ function runTests() { event: "onErrorOccurred", details: { error: "net::ERR_ABORTED", frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('failures/e.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js b/chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js index 7e6f8f1..2b2c524 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,12 +15,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -29,24 +31,28 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["client_redirect"], @@ -55,24 +61,28 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/b.html') }}, { label: "c-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}, { label: "c-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["forward_back"], @@ -81,12 +91,14 @@ function runTests() { { label: "c-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}, { label: "c-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('forwardBack/a.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_history.js b/chrome/test/data/extensions/api_test/webnavigation/test_history.js index 201eceb..e06e264 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_history.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_history.js @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('history/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,18 +30,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('history/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('history/b.html') }}, { label: "a-onHistoryStateUpdated", event: "onHistoryStateUpdated", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["client_redirect"], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js b/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js index 9af05d88..af72305 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js @@ -15,12 +15,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -29,24 +31,28 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/a.html') }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -55,24 +61,28 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/b.html') }}, { label: "c-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}, { label: "c-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -81,12 +91,14 @@ function runTests() { { label: "c-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}, { label: "c-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}], @@ -106,12 +118,14 @@ function runTests() { { label: "d-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/d.html') }}, { label: "d-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -120,24 +134,28 @@ function runTests() { { label: "d-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/d.html') }}, { label: "d-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/d.html') }}, { label: "e-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/e.html') }}, { label: "e-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -146,24 +164,28 @@ function runTests() { { label: "e-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/e.html') }}, { label: "e-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/e.html') }}, { label: "f-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/f.html') }}, { label: "f-onCommitted", event: "onCommitted", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -172,24 +194,28 @@ function runTests() { { label: "f-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/f.html') }}, { label: "f-onCompleted", event: "onCompleted", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/f.html') }}, { label: "g-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/g.html') }}, { label: "g-onCommitted", event: "onCommitted", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -198,12 +224,14 @@ function runTests() { { label: "g-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/g.html') }}, { label: "g-onCompleted", event: "onCompleted", details: { frameId: 2, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/g.html') }}], @@ -225,12 +253,14 @@ function runTests() { { label: "h-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/h.html') }}, { label: "h-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -239,24 +269,28 @@ function runTests() { { label: "h-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/h.html') }}, { label: "h-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/h.html') }}, { label: "i-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/i.html') }}, { label: "i-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -265,24 +299,28 @@ function runTests() { { label: "i-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/i.html') }}, { label: "i-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/i.html') }}, { label: "c-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}, { label: "c-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ['maybe_client_redirect'], @@ -291,12 +329,14 @@ function runTests() { { label: "c-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}, { label: "c-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('iframe/c.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_openTab.js b/chrome/test/data/extensions/api_test/webnavigation/test_openTab.js index 5b33110..707b086 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_openTab.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_openTab.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,18 +30,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCreatedNavigationTarget", event: "onCreatedNavigationTarget", details: { sourceFrameId: 0, + sourceProcessId: 0, sourceTabId: 0, tabId: 1, timeStamp: 0, @@ -47,12 +52,14 @@ function runTests() { { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -61,12 +68,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}], @@ -83,12 +92,14 @@ function runTests() { { label: "c-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/c.html') }}, { label: "c-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -97,24 +108,28 @@ function runTests() { { label: "c-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/c.html') }}, { label: "c-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/c.html') }}, { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -123,18 +138,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 1, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('openTab/a.html') }}, { label: "a-onCreatedNavigationTarget", event: "onCreatedNavigationTarget", details: { sourceFrameId: 1, + sourceProcessId: 0, sourceTabId: 0, tabId: 1, timeStamp: 0, @@ -142,12 +160,14 @@ function runTests() { { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -156,12 +176,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('openTab/b.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_prerender.js b/chrome/test/data/extensions/api_test/webnavigation/test_prerender.js index 46348f8..a68c730 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_prerender.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_prerender.js @@ -24,12 +24,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -38,24 +40,28 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 1, tabId: 1, timeStamp: 0, url: URL_TARGET }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 1, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -64,12 +70,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 1, tabId: 1, timeStamp: 0, url: URL_TARGET }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 1, tabId: 1, timeStamp: 0, url: URL_TARGET }}, diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_referenceFragment.js b/chrome/test/data/extensions/api_test/webnavigation/test_referenceFragment.js index 96a5a71..7366788 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_referenceFragment.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_referenceFragment.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('referenceFragment/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,18 +30,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('referenceFragment/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('referenceFragment/a.html#anchor') }}, { label: "a-onReferenceFragmentUpdated", event: "onReferenceFragmentUpdated", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["client_redirect"], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_requestOpenTab.js b/chrome/test/data/extensions/api_test/webnavigation/test_requestOpenTab.js index 4301571..cdc868e 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_requestOpenTab.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_requestOpenTab.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('requestOpenTab/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,18 +30,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('requestOpenTab/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('requestOpenTab/a.html') }}, { label: "b-onCreatedNavigationTarget", event: "onCreatedNavigationTarget", details: { sourceFrameId: 0, + sourceProcessId: 0, sourceTabId: 0, tabId: 1, timeStamp: 0, @@ -47,12 +52,14 @@ function runTests() { { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('requestOpenTab/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -61,12 +68,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('requestOpenTab/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('requestOpenTab/b.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js b/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js index b4bef1e..8cb7091 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js @@ -22,12 +22,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD_REDIRECT }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: ["server_redirect"], @@ -36,12 +38,14 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js b/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js index a40f8f1..094f05e 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('simpleLoad/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,12 +30,14 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('simpleLoad/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('simpleLoad/a.html') }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_targetBlank.js b/chrome/test/data/extensions/api_test/webnavigation/test_targetBlank.js index fd1ef68..e356087 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_targetBlank.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_targetBlank.js @@ -25,12 +25,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -39,18 +41,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: URL_LOAD }}, { label: "b-onCreatedNavigationTarget", event: "onCreatedNavigationTarget", details: { sourceFrameId: 0, + sourceProcessId: 0, sourceTabId: 0, tabId: 1, timeStamp: 0, @@ -58,12 +63,14 @@ function runTests() { { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: URL_TARGET }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -72,12 +79,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: URL_TARGET }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: URL_TARGET }}], diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_userAction.js b/chrome/test/data/extensions/api_test/webnavigation/test_userAction.js index 6f80aa2..7c44d43 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/test_userAction.js +++ b/chrome/test/data/extensions/api_test/webnavigation/test_userAction.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,12 +14,14 @@ function runTests() { { label: "a-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('userAction/a.html') }}, { label: "a-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, transitionQualifiers: [], @@ -28,18 +30,21 @@ function runTests() { { label: "a-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('userAction/a.html') }}, { label: "a-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 0, timeStamp: 0, url: getURL('userAction/a.html') }}, { label: "b-onCreatedNavigationTarget", event: "onCreatedNavigationTarget", details: { sourceFrameId: 0, + sourceProcessId: 0, sourceTabId: 0, tabId: 1, timeStamp: 0, @@ -47,12 +52,14 @@ function runTests() { { label: "b-onBeforeNavigate", event: "onBeforeNavigate", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('userAction/b.html') }}, { label: "b-onCommitted", event: "onCommitted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, transitionQualifiers: [], @@ -61,12 +68,14 @@ function runTests() { { label: "b-onDOMContentLoaded", event: "onDOMContentLoaded", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('userAction/b.html') }}, { label: "b-onCompleted", event: "onCompleted", details: { frameId: 0, + processId: 0, tabId: 1, timeStamp: 0, url: getURL('userAction/b.html') }}], -- cgit v1.1