diff options
author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:03:26 +0000 |
---|---|---|
committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:03:26 +0000 |
commit | 896e0965695e8770ab2f78c2a5231a0bb6ad0c8c (patch) | |
tree | a43a1b978a927f056755b815a183b5363d6267c1 /chrome/renderer/resources | |
parent | af1fde05ba3696986ba28445ea0c74f96d456ebb (diff) | |
download | chromium_src-896e0965695e8770ab2f78c2a5231a0bb6ad0c8c.zip chromium_src-896e0965695e8770ab2f78c2a5231a0bb6ad0c8c.tar.gz chromium_src-896e0965695e8770ab2f78c2a5231a0bb6ad0c8c.tar.bz2 |
Fix CaptureVisibleTabRace to complete deterministically.
Also fix expected/actual argument order in chrome.test.assertEq call and
the way we report kInternalVisibleTabCaptureError (we assign it to error_
directly in all places but one).
BUG=80212
TEST=ExtensionApiTest.CaptureVisibleTabRace
Review URL: http://codereview.chromium.org/6894005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources')
-rw-r--r-- | chrome/renderer/resources/extension_apitest.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/resources/extension_apitest.js b/chrome/renderer/resources/extension_apitest.js index 4f5d94b6..16b2164 100644 --- a/chrome/renderer/resources/extension_apitest.js +++ b/chrome/renderer/resources/extension_apitest.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -75,7 +75,7 @@ var chrome = chrome || {}; }; chrome.test.runNextTest = function() { - chrome.test.assertEq(pendingCallbacks, 0); + chrome.test.assertEq(0, pendingCallbacks); lastTest = currentTest; currentTest = chrome.test.tests.shift(); if (!currentTest) { |