| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 | 10 |
| 11 #include "app/app_paths.h" | 11 #include "app/app_paths.h" |
| 12 #include "app/resource_bundle.h" | 12 #include "app/resource_bundle.h" |
| 13 #include "app/win/scoped_com_initializer.h" | 13 #include "app/win/scoped_com_initializer.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/debug/debugger.h" | 15 #include "base/debug/debugger.h" |
| 16 #include "base/file_util.h" | 16 #include "base/file_util.h" |
| 17 #include "base/file_version_info.h" | 17 #include "base/file_version_info.h" |
| 18 #include "base/i18n/icu_util.h" | 18 #include "base/i18n/icu_util.h" |
| 19 #include "base/path_service.h" | 19 #include "base/path_service.h" |
| 20 #include "base/scoped_comptr_win.h" | 20 #include "base/scoped_comptr_win.h" |
| 21 #include "base/string_util.h" | 21 #include "base/string_util.h" |
| 22 #include "base/stringprintf.h" | 22 #include "base/stringprintf.h" |
| 23 #include "base/threading/platform_thread.h" | 23 #include "base/threading/platform_thread.h" |
| 24 #include "base/win/scoped_handle.h" |
| 24 #include "chrome/browser/automation/automation_provider_list.h" | 25 #include "chrome/browser/automation/automation_provider_list.h" |
| 25 #include "chrome/browser/plugin_service.h" | 26 #include "chrome/browser/plugin_service.h" |
| 26 #include "chrome/browser/prefs/browser_prefs.h" | 27 #include "chrome/browser/prefs/browser_prefs.h" |
| 27 #include "chrome/browser/prefs/pref_service.h" | 28 #include "chrome/browser/prefs/pref_service.h" |
| 28 #include "chrome/browser/process_singleton.h" | 29 #include "chrome/browser/process_singleton.h" |
| 29 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
| 30 #include "chrome/browser/renderer_host/render_process_host.h" | 31 #include "chrome/browser/renderer_host/render_process_host.h" |
| 31 #include "chrome/browser/renderer_host/web_cache_manager.h" | 32 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 32 #include "chrome/common/chrome_constants.h" | 33 #include "chrome/common/chrome_constants.h" |
| 33 #include "chrome/common/chrome_paths.h" | 34 #include "chrome/common/chrome_paths.h" |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 273 |
| 273 app::win::ScopedCOMInitializer com; | 274 app::win::ScopedCOMInitializer com; |
| 274 chrome_frame_test::CloseAllIEWindows(); | 275 chrome_frame_test::CloseAllIEWindows(); |
| 275 | 276 |
| 276 test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort)); | 277 test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort)); |
| 277 test_http_server_->AddResponse(&chrome_frame_html_); | 278 test_http_server_->AddResponse(&chrome_frame_html_); |
| 278 std::wstring url(base::StringPrintf(L"http://localhost:%i/chrome_frame", | 279 std::wstring url(base::StringPrintf(L"http://localhost:%i/chrome_frame", |
| 279 kTestServerPort).c_str()); | 280 kTestServerPort).c_str()); |
| 280 | 281 |
| 281 // Launch IE. This launches IE correctly on Vista too. | 282 // Launch IE. This launches IE correctly on Vista too. |
| 282 ScopedHandle ie_process(chrome_frame_test::LaunchIE(url)); | 283 base::win::ScopedHandle ie_process(chrome_frame_test::LaunchIE(url)); |
| 283 EXPECT_TRUE(ie_process.IsValid()); | 284 EXPECT_TRUE(ie_process.IsValid()); |
| 284 | 285 |
| 285 // NOTE: If you're running IE8 and CF is not being loaded, you need to | 286 // NOTE: If you're running IE8 and CF is not being loaded, you need to |
| 286 // disable IE8's prebinding until CF properly handles that situation. | 287 // disable IE8's prebinding until CF properly handles that situation. |
| 287 // | 288 // |
| 288 // HKCU\Software\Microsoft\Internet Explorer\Main | 289 // HKCU\Software\Microsoft\Internet Explorer\Main |
| 289 // Value name: EnablePreBinding (REG_DWORD) | 290 // Value name: EnablePreBinding (REG_DWORD) |
| 290 // Value: 0 | 291 // Value: 0 |
| 291 } | 292 } |
| 292 | 293 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 // See url_request_unittest.cc for these credentials. | 494 // See url_request_unittest.cc for these credentials. |
| 494 SupplyProxyCredentials credentials("user", "secret"); | 495 SupplyProxyCredentials credentials("user", "secret"); |
| 495 watchdog.AddObserver(&credentials, "Windows Security", ""); | 496 watchdog.AddObserver(&credentials, "Windows Security", ""); |
| 496 testing::InitGoogleTest(&argc, argv); | 497 testing::InitGoogleTest(&argc, argv); |
| 497 FilterDisabledTests(); | 498 FilterDisabledTests(); |
| 498 PluginService::EnableChromePlugins(false); | 499 PluginService::EnableChromePlugins(false); |
| 499 CFUrlRequestUnittestRunner test_suite(argc, argv); | 500 CFUrlRequestUnittestRunner test_suite(argc, argv); |
| 500 test_suite.RunMainUIThread(); | 501 test_suite.RunMainUIThread(); |
| 501 return 0; | 502 return 0; |
| 502 } | 503 } |
| OLD | NEW |