OLD | NEW |
1 // Copyright (c) 2011 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 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 | 692 |
693 int PpapiPluginMain(const content::MainFunctionParams& parameters) { | 693 int PpapiPluginMain(const content::MainFunctionParams& parameters) { |
694 return PluginMain(parameters); | 694 return PluginMain(parameters); |
695 } | 695 } |
696 | 696 |
697 int WorkerMain(const content::MainFunctionParams& parameters) { | 697 int WorkerMain(const content::MainFunctionParams& parameters) { |
698 return PluginMain(parameters); | 698 return PluginMain(parameters); |
699 } | 699 } |
700 | 700 |
701 int main(int argc, char** argv) { | 701 int main(int argc, char** argv) { |
| 702 ScopedChromeFrameRegistrar::RegisterAndExitProcessIfDirected(); |
702 g_argc = argc; | 703 g_argc = argc; |
703 g_argv = argv; | 704 g_argv = argv; |
704 | 705 |
705 if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { | 706 if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { |
706 // Adding this here as the command line and the logging stuff gets | 707 // Adding this here as the command line and the logging stuff gets |
707 // initialized in the NetTestSuite constructor. Did not want to break that. | 708 // initialized in the NetTestSuite constructor. Did not want to break that. |
708 base::AtExitManager at_exit_manager; | 709 base::AtExitManager at_exit_manager; |
709 CommandLine::Init(argc, argv); | 710 CommandLine::Init(argc, argv); |
710 CFUrlRequestUnittestRunner::InitializeLogging(); | 711 CFUrlRequestUnittestRunner::InitializeLogging(); |
711 LOG(INFO) << "Not running ChromeFrame net tests on IE9+"; | 712 LOG(INFO) << "Not running ChromeFrame net tests on IE9+"; |
(...skipping 19 matching lines...) Expand all Loading... |
731 // content::InitializeSandboxInfo(&sandbox_info); | 732 // content::InitializeSandboxInfo(&sandbox_info); |
732 FakeMainDelegate delegate; | 733 FakeMainDelegate delegate; |
733 content::ContentMain( | 734 content::ContentMain( |
734 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), | 735 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), |
735 &sandbox_info, | 736 &sandbox_info, |
736 &delegate); | 737 &delegate); |
737 | 738 |
738 // Note: In debug builds, we ExitProcess during PostDestroyThreads. | 739 // Note: In debug builds, we ExitProcess during PostDestroyThreads. |
739 return g_test_suite->test_result(); | 740 return g_test_suite->test_result(); |
740 } | 741 } |
OLD | NEW |