diff options
| -rw-r--r-- | chrome_frame/test/url_request_test.cc | 3 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc index 1393aaa..106f717b 100644 --- a/chrome_frame/test/url_request_test.cc +++ b/chrome_frame/test/url_request_test.cc @@ -104,8 +104,7 @@ TEST(UrlmonUrlRequestTest, Simple1) { // Same as Simple1 except we use the HEAD verb to fetch only the headers // from the server. -// TODO(tommi): Fix and reenable. -TEST(UrlmonUrlRequestTest, DISABLED_Head) { +TEST(UrlmonUrlRequestTest, Head) { MockUrlDelegate mock; ChromeFrameHTTPServer server; chrome_frame_test::TimedMsgLoop loop; diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index 7f330ab..5bfbbbf 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -373,6 +373,8 @@ STDMETHODIMP UrlmonUrlRequest::OnStopBinding(HRESULT result, LPCWSTR error) { // TRUE |FALSE => Wait for Read. // TRUE |TRUE => Something went wrong!! + DCHECK(!(pending_read_size_ > 0 && pending_data_)); + if (pending_data_) { ReleaseBindings(); return S_OK; @@ -635,7 +637,7 @@ STDMETHODIMP UrlmonUrlRequest::GetWindow(const GUID& guid_reason, #endif // We should return a non-NULL HWND as parent. Otherwise no dialog is shown. // TODO(iyengar): This hits when running the URL request tests. - DLOG_IF(WARNING, !::IsWindow(parent_window_)) + DLOG_IF(ERROR, !::IsWindow(parent_window_)) << "UrlmonUrlRequest::GetWindow - no window!"; *parent_window = parent_window_; return S_OK; |