| 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 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 default: | 914 default: |
| 915 return "Error."; | 915 return "Error."; |
| 916 } | 916 } |
| 917 } | 917 } |
| 918 | 918 |
| 919 content::BrowserMainParts* FakeContentBrowserClient::CreateBrowserMainParts( | 919 content::BrowserMainParts* FakeContentBrowserClient::CreateBrowserMainParts( |
| 920 const content::MainFunctionParams& parameters) { | 920 const content::MainFunctionParams& parameters) { |
| 921 // Normally this would happen during browser startup, but for tests | 921 // Normally this would happen during browser startup, but for tests |
| 922 // we need to trigger creation of Profile-related services. | 922 // we need to trigger creation of Profile-related services. |
| 923 ChromeBrowserMainExtraPartsProfiles:: | 923 ChromeBrowserMainExtraPartsProfiles:: |
| 924 EnsureProfileKeyedServiceFactoriesBuilt(); | 924 EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 925 | 925 |
| 926 // We never delete this, as the content module takes ownership. | 926 // We never delete this, as the content module takes ownership. |
| 927 // | 927 // |
| 928 // We must not construct this earlier, or we will have out-of-order | 928 // We must not construct this earlier, or we will have out-of-order |
| 929 // AtExitManager creation/destruction. | 929 // AtExitManager creation/destruction. |
| 930 g_test_suite = new CFUrlRequestUnittestRunner(g_argc, g_argv); | 930 g_test_suite = new CFUrlRequestUnittestRunner(g_argc, g_argv); |
| 931 g_test_suite->set_crash_service(chrome_frame_test::StartCrashService()); | 931 g_test_suite->set_crash_service(chrome_frame_test::StartCrashService()); |
| 932 return g_test_suite; | 932 return g_test_suite; |
| 933 } | 933 } |
| 934 | 934 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 content::InitializeSandboxInfo(&sandbox_info); | 974 content::InitializeSandboxInfo(&sandbox_info); |
| 975 FakeMainDelegate delegate; | 975 FakeMainDelegate delegate; |
| 976 content::ContentMain( | 976 content::ContentMain( |
| 977 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), | 977 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), |
| 978 &sandbox_info, | 978 &sandbox_info, |
| 979 &delegate); | 979 &delegate); |
| 980 | 980 |
| 981 // Note: In debug builds, we ExitProcess during PostDestroyThreads. | 981 // Note: In debug builds, we ExitProcess during PostDestroyThreads. |
| 982 return g_test_suite->test_result(); | 982 return g_test_suite->test_result(); |
| 983 } | 983 } |
| OLD | NEW |