| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 4 |
| 5 #include "chrome_frame/test/test_with_web_server.h" | 5 #include "chrome_frame/test/test_with_web_server.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" |
| 7 #include "base/file_version_info.h" | 8 #include "base/file_version_info.h" |
| 9 #include "base/path_service.h" |
| 8 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 9 #include "base/win_util.h" | 11 #include "base/win_util.h" |
| 10 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 11 #include "chrome/installer/util/install_util.h" | 13 #include "chrome/installer/util/install_util.h" |
| 12 #include "chrome/installer/util/helper.h" | 14 #include "chrome/installer/util/helper.h" |
| 13 #include "chrome_frame/utils.h" | 15 #include "chrome_frame/utils.h" |
| 14 #include "chrome_frame/test/chrome_frame_test_utils.h" | 16 #include "chrome_frame/test/chrome_frame_test_utils.h" |
| 15 #include "chrome_frame/test/mock_ie_event_sink_actions.h" | 17 #include "chrome_frame/test/mock_ie_event_sink_actions.h" |
| 16 #include "net/base/mime_util.h" | 18 #include "net/base/mime_util.h" |
| 17 | 19 |
| (...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 chrome_frame_test::TimedMsgLoop loop; | 991 chrome_frame_test::TimedMsgLoop loop; |
| 990 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); | 992 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); |
| 991 | 993 |
| 992 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 994 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 993 | 995 |
| 994 chrome_frame_test::CloseAllIEWindows(); | 996 chrome_frame_test::CloseAllIEWindows(); |
| 995 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", | 997 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", |
| 996 "OK")); | 998 "OK")); |
| 997 } | 999 } |
| 998 | 1000 |
| OLD | NEW |