summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-13 23:09:10 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-13 23:09:10 +0000
commita6b74633db8d0ff13c635a0fd25c311f7e191827 (patch)
treea71333be271567f1331dc5235d64513b8c1b656b /chrome/test
parent085e3d7f674960e0ace28cc9be8566cc36ff366f (diff)
downloadchromium_src-a6b74633db8d0ff13c635a0fd25c311f7e191827.zip
chromium_src-a6b74633db8d0ff13c635a0fd25c311f7e191827.tar.gz
chromium_src-a6b74633db8d0ff13c635a0fd25c311f7e191827.tar.bz2
Revert 77980 - Raise logging level, so we can see logs on buildbot. Will revert once buildbot tests start.
TEST=ExtensionHistoryApiTest.* TBR=skerner TBR=skerner@chromium.org Review URL: http://codereview.chromium.org/6679036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/history/common.js34
1 files changed, 13 insertions, 21 deletions
diff --git a/chrome/test/data/extensions/api_test/history/common.js b/chrome/test/data/extensions/api_test/history/common.js
index b9ce233..e3eeb8e 100644
--- a/chrome/test/data/extensions/api_test/history/common.js
+++ b/chrome/test/data/extensions/api_test/history/common.js
@@ -155,27 +155,19 @@ function addUrlsWithTimeline(urls, callback) {
// to pass to the callback.
chrome.history.search({text: ''}, function(historyItems) {
// Check that both URLs were added.
- console.log(" 1: historyItems = " + JSON.stringify(historyItems, null, 2));
-
- waitAFewSeconds(1, function() {
- chrome.history.search({text: ''}, function(historyItems) {
- console.log(" 2: historyItems = " + JSON.stringify(historyItems, null, 2));
-
- assertEq(urls.length, historyItems.length);
-
- // Don't assume anything about the order of history records in
- // |historyItems|.
- var firstUrlTime = Math.min(historyItems[0].lastVisitTime,
- historyItems[1].lastVisitTime);
- var secondUrlTime = Math.max(historyItems[0].lastVisitTime,
- historyItems[1].lastVisitTime);
-
- callback({
- before: firstUrlTime - 100.0,
- between: (firstUrlTime + secondUrlTime) / 2.0,
- after: secondUrlTime + 100.0
- });
- });
+ assertEq(urls.length, historyItems.length);
+
+ // Don't assume anything about the order of history records in
+ // |historyItems|.
+ var firstUrlTime = Math.min(historyItems[0].lastVisitTime,
+ historyItems[1].lastVisitTime);
+ var secondUrlTime = Math.max(historyItems[0].lastVisitTime,
+ historyItems[1].lastVisitTime);
+
+ callback({
+ before: firstUrlTime - 100.0,
+ between: (firstUrlTime + secondUrlTime) / 2.0,
+ after: secondUrlTime + 100.0
});
});
});