diff options
19 files changed, 6 insertions, 554 deletions
diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 1eae3a6..c58ecd0 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -40,11 +40,6 @@ int GetFrameId(ProvisionalLoadDetails* details) { return details->main_frame() ? 0 : static_cast<int>(details->frame_id()); } -// Returns |time| as milliseconds since the epoch. -double MilliSecondsFromTime(const base::Time& time) { - return 1000 * time.ToDoubleT(); -} - // Dispatches events to the extension message service. void DispatchEvent(Profile* profile, const char* event_name, @@ -67,7 +62,6 @@ void DispatchOnBeforeNavigate(NavigationController* controller, dict->SetInteger(keys::kFrameIdKey, GetFrameId(details)); dict->SetString(keys::kRequestIdKey, base::Uint64ToString(request_id)); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; @@ -95,7 +89,6 @@ void DispatchOnCommitted(NavigationController* controller, if (details->transition_type() & PageTransition::FORWARD_BACK) qualifiers->Append(Value::CreateStringValue("forward_back")); dict->Set(keys::kTransitionQualifiersKey, qualifiers); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; @@ -115,7 +108,6 @@ void DispatchOnDOMContentLoaded(NavigationController* controller, dict->SetString(keys::kUrlKey, url.spec()); dict->SetInteger(keys::kFrameIdKey, is_main_frame ? 0 : static_cast<int>(frame_id)); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; @@ -135,7 +127,6 @@ void DispatchOnCompleted(NavigationController* controller, dict->SetString(keys::kUrlKey, url.spec()); dict->SetInteger(keys::kFrameIdKey, is_main_frame ? 0 : static_cast<int>(frame_id)); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; @@ -362,7 +353,6 @@ void ExtensionWebNavigationEventRouter::FailProvisionalLoadWithError( dict->SetInteger(keys::kFrameIdKey, GetFrameId(details)); dict->SetString(keys::kErrorKey, std::string(net::ErrorToString(details->error_code()))); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; @@ -381,7 +371,6 @@ void ExtensionWebNavigationEventRouter::CreatingNewWindow( dict->SetString(keys::kSourceUrlKey, details->opener_url.spec()); dict->SetString(keys::kUrlKey, details->target_url.possibly_invalid_spec()); - dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); std::string json_args; diff --git a/chrome/browser/extensions/extension_webnavigation_api_constants.cc b/chrome/browser/extensions/extension_webnavigation_api_constants.cc index faad7e7..8566fef 100644 --- a/chrome/browser/extensions/extension_webnavigation_api_constants.cc +++ b/chrome/browser/extensions/extension_webnavigation_api_constants.cc @@ -12,7 +12,6 @@ const char kRequestIdKey[] = "requestId"; const char kSourceTabIdKey[] = "sourceTabId"; const char kSourceUrlKey[] = "sourceUrl"; const char kTabIdKey[] = "tabId"; -const char kTimeStampKey[] = "timeStamp"; const char kTransitionTypeKey[] = "transitionType"; const char kTransitionQualifiersKey[] = "transitionQualifiers"; const char kUrlKey[] = "url"; diff --git a/chrome/browser/extensions/extension_webnavigation_api_constants.h b/chrome/browser/extensions/extension_webnavigation_api_constants.h index 1c1b894..775cf0d 100644 --- a/chrome/browser/extensions/extension_webnavigation_api_constants.h +++ b/chrome/browser/extensions/extension_webnavigation_api_constants.h @@ -17,7 +17,6 @@ extern const char kRequestIdKey[]; extern const char kSourceTabIdKey[]; extern const char kSourceUrlKey[]; extern const char kTabIdKey[]; -extern const char kTimeStampKey[]; extern const char kTransitionTypeKey[]; extern const char kTransitionQualifiersKey[]; extern const char kUrlKey[]; diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index c2f19bb..e83cbed9 100644 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -3411,8 +3411,7 @@ "tabId": {"type": "integer", "description": "The ID of the tab in which the navigation is about to occur."}, "url": {"type": "string"}, "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe. Frame IDs are unique within a tab."}, - "requestId": {"type": "string", "description": "The ID of the request to retrieve the document of this navigation. Note that this event is fired prior to the corresponding chrome.experimental.webRequest.onBeforeRequest."}, - "timeStamp": {"type": "number", "description": "The time when the browser was about to start the navigation, in milliseconds since the epoch."} + "requestId": {"type": "string", "description": "The ID of the request to retrieve the document of this navigation. Note that this event is fired prior to the corresponding chrome.experimental.webRequest.onBeforeRequest."} } } ] @@ -3430,8 +3429,7 @@ "url": {"type": "string"}, "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."}, "transitionType": {"type": "string", "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"], "description": "Cause of the navigation. The same transition types as defined in the history API are used."}, - "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items:": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back"]}}, - "timeStamp": {"type": "number", "description": "The time when the navigation was committed, in milliseconds since the epoch."} + "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items:": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back"]}} } } ] @@ -3447,8 +3445,7 @@ "properties": { "tabId": {"type": "integer", "description": "The ID of the tab in which the navigation occurs."}, "url": {"type": "string"}, - "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."}, - "timeStamp": {"type": "number", "description": "The time when the page's DOM was fully constructed, in milliseconds since the epoch."} + "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."} } } ] @@ -3464,8 +3461,7 @@ "properties": { "tabId": {"type": "integer", "description": "The ID of the tab in which the navigation occurs."}, "url": {"type": "string"}, - "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."}, - "timeStamp": {"type": "number", "description": "The time when the document finished loading, in milliseconds since the epoch."} + "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."} } } ] @@ -3482,8 +3478,7 @@ "tabId": {"type": "integer", "description": "The ID of the tab in which the navigation occurs."}, "url": {"type": "string"}, "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."}, - "error": {"type": "string", "description": "The error description."}, - "timeStamp": {"type": "number", "description": "The time when the error occurred, in milliseconds since the epoch."} + "error": {"type": "string", "description": "The error description."} } } ] @@ -3499,8 +3494,7 @@ "properties": { "sourceTabId": {"type": "integer", "description": "The ID of the tab in which the navigation is triggered."}, "sourceUrl": {"type": "string", "description": "The URL of the document that is opening the new window."}, - "url": {"type": "string", "description": "The URL to be opened in the new window."}, - "timeStamp": {"type": "number", "description": "The time when the browser was about to create a new view, in milliseconds since the epoch."} + "url": {"type": "string", "description": "The URL to be opened in the new window."} } } ] diff --git a/chrome/common/extensions/docs/experimental.webNavigation.html b/chrome/common/extensions/docs/experimental.webNavigation.html index 9b16346..31ed43d 100644 --- a/chrome/common/extensions/docs/experimental.webNavigation.html +++ b/chrome/common/extensions/docs/experimental.webNavigation.html @@ -766,74 +766,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the browser was about to start the navigation, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> @@ -1127,74 +1059,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the browser was about to create a new view, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> @@ -1626,74 +1490,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the navigation was committed, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> @@ -1989,74 +1785,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the document finished loading, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> @@ -2352,74 +2080,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the page's DOM was fully constructed, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> @@ -2783,74 +2443,6 @@ </dd> </div> - </div><div> - <div> - <dt> - <var>timeStamp</var> - <em> - - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional" style="display: none; ">optional</span> - <span class="enum" style="display: none; ">enumerated</span> - <span id="typeTemplate"> - <span style="display: none; "> - <a> Type</a> - </span> - <span> - <span style="display: none; "> - array of <span><span></span></span> - </span> - <span>number</span> - <span style="display: none; "></span> - </span> - </span> - ) - </div> - - </em> - </dt> - <dd class="todo" style="display: none; "> - Undocumented. - </dd> - <dd>The time when the error occurred, in milliseconds since the epoch.</dd> - <dd style="display: none; "> - This parameter was added in version - <b><span></span></b>. - You must omit this parameter in earlier versions, - and you may omit it in any version. If you require this - parameter, the manifest key - <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> - can ensure that your extension won't be run in an earlier browser version. - </dd> - - <!-- OBJECT PROPERTIES --> - <dd style="display: none; "> - <dl> - <div> - <div> - </div> - </div> - </dl> - </dd> - - <!-- OBJECT METHODS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- OBJECT EVENT FIELDS --> - <dd style="display: none; "> - <div></div> - </dd> - - <!-- FUNCTION PARAMETERS --> - <dd style="display: none; "> - <div></div> - </dd> - - </div> </div> </dl> </dd> diff --git a/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/framework.js b/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/tests.js b/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/tests.js index 1b9094e..e2994e8 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/clientRedirect/tests.js @@ -12,47 +12,39 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: ["client_redirect"], transitionType: "link", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('b.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/failures/framework.js b/chrome/test/data/extensions/api_test/webnavigation/failures/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/failures/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/failures/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/failures/tests.js b/chrome/test/data/extensions/api_test/webnavigation/failures/tests.js index 99b97c5..e4a9237 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/failures/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/failures/tests.js @@ -11,13 +11,11 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('nonexistant.html') }], [ "onErrorOccurred", { error: "net::ERR_FILE_NOT_FOUND", frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('nonexistant.html') }]]); chrome.tabs.update(tabId, { url: getURL('nonexistant.html') }); }, @@ -29,12 +27,10 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('d.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('d.html') }], @@ -42,23 +38,19 @@ function runTests() { { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('d.html') }], [ "onErrorOccurred", { error: "net::ERR_FILE_NOT_FOUND", frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('d.html') }]]); chrome.tabs.update(tabId, { url: getURL('d.html') }); }, @@ -70,12 +62,10 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], @@ -83,46 +73,38 @@ function runTests() { { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 1, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "auto_subframe", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeNavigate", { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onErrorOccurred", { error: "net::ERR_FILE_NOT_FOUND", frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('c.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/forwardBack/framework.js b/chrome/test/data/extensions/api_test/webnavigation/forwardBack/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/forwardBack/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/forwardBack/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/forwardBack/tests.js b/chrome/test/data/extensions/api_test/webnavigation/forwardBack/tests.js index 6b8da61..a8851e0 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/forwardBack/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/forwardBack/tests.js @@ -12,70 +12,58 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: ["client_redirect"], transitionType: "link", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: ["forward_back"], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/iframe/framework.js b/chrome/test/data/extensions/api_test/webnavigation/iframe/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/iframe/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/iframe/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/iframe/tests.js b/chrome/test/data/extensions/api_test/webnavigation/iframe/tests.js index 6d526c8..563d02a 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/iframe/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/iframe/tests.js @@ -12,12 +12,10 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], @@ -25,57 +23,47 @@ function runTests() { { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 1, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "auto_subframe", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeNavigate", { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onCommitted", { frameId: 1, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "manual_subframe", url: getURL('c.html') }], [ "onDOMContentLoaded", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onCompleted", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('c.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, @@ -89,12 +77,10 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('d.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('d.html') }], @@ -102,80 +88,66 @@ function runTests() { { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('e.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('d.html') }], [ "onCommitted", { frameId: 1, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "auto_subframe", url: getURL('e.html') }], [ "onDOMContentLoaded", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('e.html') }], [ "onBeforeNavigate", { frameId: 2, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('f.html') }], [ "onCompleted", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('e.html') }], [ "onCommitted", { frameId: 2, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "auto_subframe", url: getURL('f.html') }], [ "onDOMContentLoaded", { frameId: 2, tabId: 0, - timeStamp: 0, url: getURL('f.html') }], [ "onCompleted", { frameId: 2, tabId: 0, - timeStamp: 0, url: getURL('f.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('d.html') }], [ "onBeforeNavigate", { frameId: 2, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('g.html') }], [ "onCommitted", { frameId: 2, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "manual_subframe", url: getURL('g.html') }], [ "onDOMContentLoaded", { frameId: 2, tabId: 0, - timeStamp: 0, url: getURL('g.html') }], [ "onCompleted", { frameId: 2, tabId: 0, - timeStamp: 0, url: getURL('g.html') }]]); chrome.tabs.update(tabId, { url: getURL('d.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/openTab/framework.js b/chrome/test/data/extensions/api_test/webnavigation/openTab/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/openTab/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/openTab/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/openTab/tests.js b/chrome/test/data/extensions/api_test/webnavigation/openTab/tests.js index d35725c..e7e4321 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/openTab/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/openTab/tests.js @@ -11,52 +11,43 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeRetarget", { sourceTabId: 0, sourceUrl: getURL('a.html'), - timeStamp: 0, url: getURL('b.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 1, - timeStamp: 0, url: getURL('b.html') }], [ "onCommitted", { frameId: 0, tabId: 1, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 1, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 1, - timeStamp: 0, url: getURL('b.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, @@ -68,12 +59,10 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('c.html') }], @@ -81,62 +70,51 @@ function runTests() { { frameId: 1, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onCommitted", { frameId: 1, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "auto_subframe", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 1, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('c.html') }], [ "onBeforeRetarget", { sourceTabId: 0, sourceUrl: getURL('a.html'), - timeStamp: 0, url: getURL('b.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 1, - timeStamp: 0, url: getURL('b.html') }], [ "onCommitted", { frameId: 0, tabId: 1, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('b.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 1, - timeStamp: 0, url: getURL('b.html') }], [ "onCompleted", { frameId: 0, tabId: 1, - timeStamp: 0, url: getURL('b.html') }]]); chrome.tabs.update(tabId, { url: getURL('c.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/framework.js b/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/tests.js b/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/tests.js index 4fb0341..02ab4d7 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/referenceFragment/tests.js @@ -11,47 +11,39 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onBeforeNavigate", { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html#anchor') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: ["client_redirect"], transitionType: "link", url: getURL('a.html#anchor') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html#anchor') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html#anchor') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, diff --git a/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/framework.js b/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/framework.js index 60f574a..ae5d768 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/framework.js +++ b/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/framework.js @@ -25,9 +25,6 @@ function checkExpectations() { function captureEvent(name, details) { // normalize details. - if ('timeStamp' in details) { - details.timeStamp = 0; - } if (('frameId' in details) && (details.frameId != 0)) { if (frameIds[details.frameId] === undefined) { frameIds[details.frameId] = nextFrameId++; diff --git a/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/tests.js b/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/tests.js index 13e7126..a7eda72 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/tests.js +++ b/chrome/test/data/extensions/api_test/webnavigation/simpleLoad/tests.js @@ -11,24 +11,20 @@ function runTests() { { frameId: 0, requestId: "0", tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCommitted", { frameId: 0, tabId: 0, - timeStamp: 0, transitionQualifiers: [], transitionType: "link", url: getURL('a.html') }], [ "onDOMContentLoaded", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }], [ "onCompleted", { frameId: 0, tabId: 0, - timeStamp: 0, url: getURL('a.html') }]]); chrome.tabs.update(tabId, { url: getURL('a.html') }); }, |