Additional XHR merge session throttle tests.
commit62757654b92632e89e24a92f87b81c080032a387
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 3 Jan 2014 03:27:55 +0000 (3 03:27 +0000)
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 3 Jan 2014 03:27:55 +0000 (3 03:27 +0000)
tree27b8eb72be819872fc3187880686455fd6749201
parentde2678fd6a789cea33bbade9b3612f56ea769550
Additional XHR merge session throttle tests.
Fixed event wait flakyness.

BUG=none
TEST=added MergeSessionTest.XHRThrottle, MergeSessionTest.NoXHRThrottle
TBR=asargent

Review URL: https://codereview.chromium.org/120403002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242859 0039d316-1c4b-4281-b951-d872f2087c98
chrome/browser/chromeos/login/oauth2_browsertest.cc
chrome/browser/chromeos/login/oobe_base_test.cc
chrome/browser/chromeos/login/oobe_base_test.h
chrome/browser/extensions/extension_browsertest.cc
chrome/browser/extensions/extension_browsertest.h
chrome/test/data/extensions/api_test/merge_session/background.js [new file with mode: 0644]
chrome/test/data/extensions/api_test/merge_session/manifest.json [new file with mode: 0644]