diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 04:17:08 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 04:17:08 +0000 |
| commit | 4cfa0ba10fe92327f382a372af163c7915a6f6a8 (patch) | |
| tree | b32a45b5146f828164b9d920d891e41a46c5e59f /chrome_frame | |
| parent | 1c741b888324973516cb330620853c5a1e396d40 (diff) | |
| download | chromium_src-4cfa0ba10fe92327f382a372af163c7915a6f6a8.zip chromium_src-4cfa0ba10fe92327f382a372af163c7915a6f6a8.tar.gz chromium_src-4cfa0ba10fe92327f382a372af163c7915a6f6a8.tar.bz2 | |
Attempt to fix the chrome frame net tests failures on the builders. There seems to be a race condition causing
the tests to hang on startup on the builder. It appears that on chrome frame net tests startup we process an initial
HTTP head request in the test automation provider factory and end up sending this as the response to IE instead of
the expected dummy chrome frame page. This causes the tests to hang.
Fix is to also check for a valid tab handle in the test automation provider factory instead of just asserting for
the same.
TBR=amit
Review URL: http://codereview.chromium.org/2951015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/test_automation_provider.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc index a9da4d1..563a8c1 100644 --- a/chrome_frame/test/net/test_automation_provider.cc +++ b/chrome_frame/test/net/test_automation_provider.cc @@ -74,8 +74,8 @@ URLRequestJob* TestAutomationProvider::Factory(URLRequest* request, // We could also check if the current thread is our TestUrlRequest thread // and only intercept requests that belong to that thread. - if (g_provider_instance_ && request->GetUserData(NULL) == NULL) { - DCHECK(g_provider_instance_->tab_handle_ != -1); + if (g_provider_instance_ && request->GetUserData(NULL) == NULL && + g_provider_instance_->tab_handle_ != -1) { // We generate our own request id which is also what // ResourceDispatcherHost does (well, the id is actually generated by // ResourceDispatcher). Since these requests are divided into with |