| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/net/fake_external_tab.h" | 5 #include "chrome_frame/test/net/fake_external_tab.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlcom.h> | 8 #include <atlcom.h> |
| 9 #include <exdisp.h> | 9 #include <exdisp.h> |
| 10 #include <Winsock2.h> | 10 #include <Winsock2.h> |
| (...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 IEVersion ie_version = chrome_frame_test::GetInstalledIEVersion(); | 960 IEVersion ie_version = chrome_frame_test::GetInstalledIEVersion(); |
| 961 LOG(INFO) << "Running CF net tests with IE version: " | 961 LOG(INFO) << "Running CF net tests with IE version: " |
| 962 << IEVersionToString(ie_version); | 962 << IEVersionToString(ie_version); |
| 963 | 963 |
| 964 // See url_request_unittest.cc for these credentials. | 964 // See url_request_unittest.cc for these credentials. |
| 965 SupplyProxyCredentials credentials("user", "secret"); | 965 SupplyProxyCredentials credentials("user", "secret"); |
| 966 WindowWatchdog watchdog; | 966 WindowWatchdog watchdog; |
| 967 watchdog.AddObserver(&credentials, "Windows Security", ""); | 967 watchdog.AddObserver(&credentials, "Windows Security", ""); |
| 968 | 968 |
| 969 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 969 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
| 970 // This would normally be done, but is probably not needed for these tests. | 970 content::InitializeSandboxInfo(&sandbox_info); |
| 971 // content::InitializeSandboxInfo(&sandbox_info); | |
| 972 FakeMainDelegate delegate; | 971 FakeMainDelegate delegate; |
| 973 content::ContentMain( | 972 content::ContentMain( |
| 974 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), | 973 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), |
| 975 &sandbox_info, | 974 &sandbox_info, |
| 976 &delegate); | 975 &delegate); |
| 977 | 976 |
| 978 // Note: In debug builds, we ExitProcess during PostDestroyThreads. | 977 // Note: In debug builds, we ExitProcess during PostDestroyThreads. |
| 979 return g_test_suite->test_result(); | 978 return g_test_suite->test_result(); |
| 980 } | 979 } |
| OLD | NEW |