summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 17:01:35 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 17:01:35 +0000
commit7a20911efec922a7b37e1d79c2d10a6b45b73d50 (patch)
tree1e0003a4e6c4bdbe3d7ee707fcec4a8dd25c7f36 /chrome_frame
parent98f8aa41c9351d34ee6e9e774922ba1fd66f7155 (diff)
downloadchromium_src-7a20911efec922a7b37e1d79c2d10a6b45b73d50.zip
chromium_src-7a20911efec922a7b37e1d79c2d10a6b45b73d50.tar.gz
chromium_src-7a20911efec922a7b37e1d79c2d10a6b45b73d50.tar.bz2
Revert 44898 - Disable two test cases in the BeginningTransaction test until I fix them.
TEST=none BUG=none TBR=amit Review URL: http://codereview.chromium.org/1633020 TBR=tommi@chromium.org Review URL: http://codereview.chromium.org/1648017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/http_negotiate_unittest.cc22
1 files changed, 9 insertions, 13 deletions
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc
index 080de83..a16a457 100644
--- a/chrome_frame/test/http_negotiate_unittest.cc
+++ b/chrome_frame/test/http_negotiate_unittest.cc
@@ -67,27 +67,24 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) {
EXPECT_NE(std::wstring::npos, cf_ua.find(cf_tag));
- // TODO(tommi): Fix the two test cases that are currently
- // commented out.
-
struct TestCase {
const std::wstring original_headers_;
const std::wstring delegate_additional_;
const std::wstring expected_additional_;
HRESULT delegate_return_value_;
} test_cases[] = {
- //{ L"Accept: */*\r\n\r\n",
- // L"",
- // cf_ua + L"\r\n\r\n",
- // S_OK },
+ { L"Accept: */*\r\n\r\n",
+ L"",
+ cf_ua + L"\r\n\r\n",
+ S_OK },
{ L"Accept: */*\r\n\r\n",
L"",
L"",
E_OUTOFMEMORY },
- //{ L"",
- // L"Accept: */*\r\n\r\n",
- // L"Accept: */*\r\n" + cf_ua + L"\r\n\r\n",
- // S_OK },
+ { L"",
+ L"Accept: */*\r\n\r\n",
+ L"Accept: */*\r\n" + cf_ua + L"\r\n\r\n",
+ S_OK },
{ L"User-Agent: Bingo/1.0\r\n\r\n",
L"",
L"User-Agent: Bingo/1.0 " + cf_tag + L"\r\n\r\n",
@@ -114,8 +111,7 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) {
if (additional) {
// Check against the expected additional headers.
- EXPECT_EQ(test.expected_additional_, std::wstring(additional))
- << " case: " << i;
+ EXPECT_EQ(test.expected_additional_, std::wstring(additional));
::CoTaskMemFree(additional);
}
}