diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 21:12:10 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 21:12:10 +0000 |
| commit | 5d0c60c865e8c3f5414bbe4f571245471b8e21a0 (patch) | |
| tree | 7fbb0814c5fba9372d4a5b9e9b3626fe9a64aabb /chrome_frame | |
| parent | 0ec9236f670f1e2e584289dcd91522d97dc3d3b8 (diff) | |
| download | chromium_src-5d0c60c865e8c3f5414bbe4f571245471b8e21a0.zip chromium_src-5d0c60c865e8c3f5414bbe4f571245471b8e21a0.tar.gz chromium_src-5d0c60c865e8c3f5414bbe4f571245471b8e21a0.tar.bz2 | |
Change the expectations of the BeginningTransaction unit test to expect the headers to be terminated by
a single \r\n combination as wininet adds the terminating \r\n at the end while sending the headers out.
TBR=stoyan
Review URL: http://codereview.chromium.org/2888019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/http_negotiate.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/http_negotiate_unittest.cc | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc index b39312d..db51fd5 100644 --- a/chrome_frame/http_negotiate.cc +++ b/chrome_frame/http_negotiate.cc @@ -140,7 +140,7 @@ std::string AppendCFUserAgentString(LPCWSTR headers, } new_headers += "User-Agent: " + user_agent_value; - new_headers += "\r\n\r\n"; + new_headers += "\r\n"; return new_headers; } diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc index 68aa113..afba216 100644 --- a/chrome_frame/test/http_negotiate_unittest.cc +++ b/chrome_frame/test/http_negotiate_unittest.cc @@ -77,29 +77,29 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) { const std::wstring expected_additional_; HRESULT delegate_return_value_; } test_cases[] = { - { L"Accept: */*\r\n\r\n", + { L"Accept: */*\r\n", L"", - cf_ua + L"\r\n\r\n", + cf_ua + L"\r\n", S_OK }, - { L"Accept: */*\r\n\r\n", + { L"Accept: */*\r\n", L"", L"", E_OUTOFMEMORY }, { L"", - L"Accept: */*\r\n\r\n", - L"Accept: */*\r\n" + cf_ua + L"\r\n\r\n", + L"Accept: */*\r\n", + L"Accept: */*\r\n" + cf_ua + L"\r\n", S_OK }, - { L"User-Agent: Bingo/1.0\r\n\r\n", + { L"User-Agent: Bingo/1.0\r\n", L"", - L"User-Agent: Bingo/1.0 " + cf_tag + L"\r\n\r\n", + L"User-Agent: Bingo/1.0 " + cf_tag + L"\r\n", S_OK }, - { L"User-Agent: NotMe/1.0\r\n\r\n", - L"User-Agent: MeMeMe/1.0\r\n\r\n", - L"User-Agent: MeMeMe/1.0 " + cf_tag + L"\r\n\r\n", + { L"User-Agent: NotMe/1.0\r\n", + L"User-Agent: MeMeMe/1.0\r\n", + L"User-Agent: MeMeMe/1.0 " + cf_tag + L"\r\n", S_OK }, { L"", - L"User-Agent: MeMeMe/1.0\r\n\r\n", - L"User-Agent: MeMeMe/1.0 " + cf_tag + L"\r\n\r\n", + L"User-Agent: MeMeMe/1.0\r\n", + L"User-Agent: MeMeMe/1.0 " + cf_tag + L"\r\n", S_OK }, }; |