| 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> |
| 11 #include <exdisp.h> | 11 #include <exdisp.h> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/file_version_info.h" | 14 #include "base/file_version_info.h" |
| 15 #include "base/file_util.h" | 15 #include "base/file_util.h" |
| 16 #include "base/scoped_bstr_win.h" | 16 #include "base/scoped_bstr_win.h" |
| 17 #include "base/scoped_comptr_win.h" | 17 #include "base/scoped_comptr_win.h" |
| 18 #include "base/scoped_variant_win.h" | 18 #include "base/scoped_variant_win.h" |
| 19 #include "base/sys_info.h" | 19 #include "base/sys_info.h" |
| 20 #include "gmock/gmock.h" | 20 #include "gmock/gmock.h" |
| 21 #include "net/url_request/url_request_unittest.h" | 21 #include "net/url_request/url_request_unittest.h" |
| 22 #include "chrome_frame/test/chrome_frame_unittests.h" | 22 #include "chrome_frame/test/chrome_frame_unittests.h" |
| 23 #include "chrome_frame/chrome_frame_automation.h" | 23 #include "chrome_frame/chrome_frame_automation.h" |
| 24 #include "chrome_frame/chrome_frame_delegate.h" | 24 #include "chrome_frame/chrome_frame_delegate.h" |
| 25 #include "chrome_frame/crash_reporting/vectored_handler-impl.h" | 25 #include "chrome_frame/crash_reporting/vectored_handler-impl.h" |
| 26 #include "chrome_frame/test/chrome_frame_test_utils.h" | 26 #include "chrome_frame/test/chrome_frame_test_utils.h" |
| 27 #include "chrome_frame/test/helper_gmock.h" | |
| 28 #include "chrome_frame/test_utils.h" | 27 #include "chrome_frame/test_utils.h" |
| 29 #include "chrome_frame/utils.h" | 28 #include "chrome_frame/utils.h" |
| 30 #include "chrome/installer/util/install_util.h" | 29 #include "chrome/installer/util/install_util.h" |
| 31 #include "chrome/installer/util/helper.h" | 30 #include "chrome/installer/util/helper.h" |
| 31 #include "testing/gmock_mutant.h" |
| 32 using testing::CreateFunctor; |
| 32 | 33 |
| 33 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data"; | 34 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data"; |
| 34 const int kLongWaitTimeout = 60 * 1000; | 35 const int kLongWaitTimeout = 60 * 1000; |
| 35 const int kShortWaitTimeout = 25 * 1000; | 36 const int kShortWaitTimeout = 25 * 1000; |
| 36 | 37 |
| 37 _ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = { | 38 _ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = { |
| 38 CC_STDCALL, VT_EMPTY, 5, { | 39 CC_STDCALL, VT_EMPTY, 5, { |
| 39 VT_DISPATCH, | 40 VT_DISPATCH, |
| 40 VT_VARIANT | VT_BYREF, | 41 VT_VARIANT | VT_BYREF, |
| 41 VT_VARIANT | VT_BYREF, | 42 VT_VARIANT | VT_BYREF, |
| (...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1506 EXPECT_TRUE(hr == S_OK); | 1507 EXPECT_TRUE(hr == S_OK); |
| 1507 | 1508 |
| 1508 web_browser2.Release(); | 1509 web_browser2.Release(); |
| 1509 chrome_frame_test::CloseAllIEWindows(); | 1510 chrome_frame_test::CloseAllIEWindows(); |
| 1510 | 1511 |
| 1511 if (should_uninit) { | 1512 if (should_uninit) { |
| 1512 CoUninitialize(); | 1513 CoUninitialize(); |
| 1513 } | 1514 } |
| 1514 } | 1515 } |
| 1515 | 1516 |
| OLD | NEW |