diff options
Diffstat (limited to 'chrome_frame/test/http_negotiate_unittest.cc')
-rw-r--r-- | chrome_frame/test/http_negotiate_unittest.cc | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc index 2fef40b..c56034b 100644 --- a/chrome_frame/test/http_negotiate_unittest.cc +++ b/chrome_frame/test/http_negotiate_unittest.cc @@ -185,96 +185,6 @@ END_COM_MAP() base::win::ScopedComPtr<IWebBrowser2> browser_; }; -TEST_F(HttpNegotiateTest, ReportProgress) { - if (chrome_frame_test::GetInstalledIEVersion() == IE_6) { - DVLOG(1) << "Not running test for IE6"; - return; - } - static const int kReportProgressIndex = 4; - CComObjectStackEx<TestInternetProtocolSink> test_sink; - IInternetProtocolSink_ReportProgress_Fn original = - reinterpret_cast<IInternetProtocolSink_ReportProgress_Fn>( - (*reinterpret_cast<void***>( - static_cast<IInternetProtocolSink*>( - &test_sink)))[kReportProgressIndex]); - - struct TestCase { - bool mark_browser_; - const ULONG status_; - const std::wstring status_text_; - const std::wstring expected_status_text_; - } test_cases[] = { - // Cases where we could switch the mime type. - { true, - BINDSTATUS_MIMETYPEAVAILABLE, - L"text/html", - kChromeMimeType }, - { false, - BINDSTATUS_MIMETYPEAVAILABLE, - L"text/html", - L"text/html" }, - { true, - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, - L"text/html", - kChromeMimeType }, - { false, - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, - L"text/html", - L"text/html" }, - { true, - LOCAL_BINDSTATUS_SERVER_MIMETYPEAVAILABLE, - L"text/html", - kChromeMimeType }, - { false, - LOCAL_BINDSTATUS_SERVER_MIMETYPEAVAILABLE, - L"text/html", - L"text/html" }, - - // Cases where we mark the browser but can't switch due to mime type. - { true, - BINDSTATUS_MIMETYPEAVAILABLE, - L"application/pdf", - L"application/pdf" }, - { true, - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, - L"application/pdf", - L"application/pdf" }, - { true, - LOCAL_BINDSTATUS_SERVER_MIMETYPEAVAILABLE, - L"application/pdf", - L"application/pdf" }, - - // Cases where we should do nothing. - { false, - BINDSTATUS_CONNECTING, - L"foo", - L"foo" }, - { false, - BINDSTATUS_UPLOADINGDATA, - L"bar", - L"bar" }, - }; - - base::win::ScopedComPtr<IBrowserService> browser; - EXPECT_HRESULT_SUCCEEDED(GetBrowserServiceFromProtocolSink(&test_sink, - browser.Receive())); - - for (int i = 0; i < arraysize(test_cases); ++i) { - TestCase& test = test_cases[i]; - if (test.mark_browser_) { - MarkBrowserOnThreadForCFNavigation(browser); - } - - HRESULT hr = HttpNegotiatePatch::ReportProgress(original, &test_sink, - test.status_, test.status_text_.c_str()); - EXPECT_EQ(S_OK, hr); - // The TLS flag should always be cleared. - EXPECT_FALSE(CheckForCFNavigation(browser, false)); - EXPECT_EQ(test.expected_status_text_, test_sink.last_status_text()); - EXPECT_EQ(test.status_, test_sink.last_status()); - } -} - using testing::AllOf; using testing::ContainsRegex; using testing::HasSubstr; |