diff options
| -rw-r--r-- | chrome_frame/test/test_mock_with_web_server.cc | 7 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chrome_frame/test/test_mock_with_web_server.cc b/chrome_frame/test/test_mock_with_web_server.cc index 11e7dc6..573c8a4 100644 --- a/chrome_frame/test/test_mock_with_web_server.cc +++ b/chrome_frame/test/test_mock_with_web_server.cc @@ -26,6 +26,8 @@ const wchar_t enter_key[] = { VK_RETURN, 0 }; const wchar_t escape_key[] = { VK_ESCAPE, 0 }; const wchar_t tab_enter_keys[] = { VK_TAB, VK_RETURN, 0 }; +bool MonikerPatchEnabled(); + // A convenience class to close all open IE windows at the end // of a scope. It's more convenient to do it this way than to // explicitly call chrome_frame_test::CloseAllIEWindows at the @@ -1254,8 +1256,9 @@ TEST_F(ChromeFrameTestWithWebServer, loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); } -// http://code.google.com/p/chromium/issues/detail?id=40124 -TEST(IEPrivacy, DISABLED_NavigationToRestrictedSite) { +TEST(IEPrivacy, NavigationToRestrictedSite) { + if (!MonikerPatchEnabled()) + return; CloseIeAtEndOfScope last_resort_close_ie; chrome_frame_test::TimedMsgLoop loop; ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock; diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 0aabb4c..6f4350d 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -19,7 +19,7 @@ const int kChromeFrameLongNavigationTimeoutInSeconds = 10; bool MonikerPatchEnabled() { ProtocolPatchMethod patch_method = static_cast<ProtocolPatchMethod>( - GetConfigInt(PATCH_METHOD_IBROWSER_AND_MONIKER, kPatchProtocols)); + GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols)); LOG_IF(ERROR, patch_method != PATCH_METHOD_IBROWSER_AND_MONIKER) << "Not running test. Moniker patch not enabled."; return patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER; @@ -703,9 +703,6 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) { const wchar_t kReferrerMainTest[] = L"files/referrer_main.html"; TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { - if (!MonikerPatchEnabled()) - return; - SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest"); } @@ -791,8 +788,7 @@ TEST_F(ChromeFrameTestWithWebServer, // Test whether POST-ing a form from an mshtml page to a CF page will cause // the request to get reissued. It should not. -// http://code.google.com/p/chromium/issues/detail?id=40124 -TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_TestPostReissue) { +TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) { if (!MonikerPatchEnabled()) return; |