| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #include <windows.h> | 4 #include <windows.h> |
| 5 #include <stdarg.h> | 5 #include <stdarg.h> |
| 6 | 6 |
| 7 // IShellWindows includes. Unfortunately we can't keep these in | 7 // IShellWindows includes. Unfortunately we can't keep these in |
| 8 // alphabetic order since exdisp will bark if some interfaces aren't fully | 8 // alphabetic order since exdisp will bark if some interfaces aren't fully |
| 9 // defined. | 9 // defined. |
| 10 #include <mshtml.h> | 10 #include <mshtml.h> |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1812 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1812 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1813 | 1813 |
| 1814 chrome_frame_test::CloseAllIEWindows(); | 1814 chrome_frame_test::CloseAllIEWindows(); |
| 1815 ASSERT_TRUE( | 1815 ASSERT_TRUE( |
| 1816 CheckResultFile(L"FullTab_XMLHttpRequestAuthorizationHeaderTest", "OK")); | 1816 CheckResultFile(L"FullTab_XMLHttpRequestAuthorizationHeaderTest", "OK")); |
| 1817 } | 1817 } |
| 1818 | 1818 |
| 1819 const wchar_t kChromeFrameFullTabModeDeleteCookieTest[] = | 1819 const wchar_t kChromeFrameFullTabModeDeleteCookieTest[] = |
| 1820 L"files/fulltab_delete_cookie_test.html"; | 1820 L"files/fulltab_delete_cookie_test.html"; |
| 1821 | 1821 |
| 1822 // TODO(ananta): DISABLED due to: | |
| 1823 // http://code.google.com/p/chromium/issues/detail?id=32546 | |
| 1824 TEST_F(ChromeFrameTestWithWebServer, | 1822 TEST_F(ChromeFrameTestWithWebServer, |
| 1825 DISABLED_FullTabModeIE_ChromeFrameDeleteCookieTest) { | 1823 FullTabModeIE_ChromeFrameDeleteCookieTest) { |
| 1826 chrome_frame_test::TimedMsgLoop loop; | 1824 chrome_frame_test::TimedMsgLoop loop; |
| 1827 | 1825 |
| 1828 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeDeleteCookieTest)); | 1826 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeDeleteCookieTest)); |
| 1829 | 1827 |
| 1830 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1828 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1831 | 1829 |
| 1832 chrome_frame_test::CloseAllIEWindows(); | 1830 chrome_frame_test::CloseAllIEWindows(); |
| 1833 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK")); | 1831 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK")); |
| 1834 } | 1832 } |
| 1835 | 1833 |
| OLD | NEW |