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 | 4 |
5 #include <atlbase.h> | 5 #include <atlbase.h> |
6 #include <iostream> | 6 #include <iostream> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/platform_thread.h" | 9 #include "base/platform_thread.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
11 #include "base/test/test_suite.h" | 11 #include "base/test/test_suite.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
14 | 14 |
15 #include "chrome_frame/test/http_server.h" | 15 #include "chrome_frame/test/http_server.h" |
16 #include "chrome_frame/test_utils.h" | 16 #include "chrome_frame/test_utils.h" |
17 | 17 |
18 // To enable ATL-based code to run in this module | 18 // To enable ATL-based code to run in this module |
19 class ChromeFrameUnittestsModule | 19 class ChromeFrameUnittestsModule |
20 : public CAtlExeModuleT<ChromeFrameUnittestsModule> { | 20 : public CAtlExeModuleT<ChromeFrameUnittestsModule> { |
| 21 public: |
| 22 static HRESULT InitializeCom() { |
| 23 return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); |
| 24 } |
21 }; | 25 }; |
22 | 26 |
23 ChromeFrameUnittestsModule _AtlModule; | 27 ChromeFrameUnittestsModule _AtlModule; |
24 | 28 |
25 const wchar_t kNoRegistrationSwitch[] = L"no-registration"; | 29 const wchar_t kNoRegistrationSwitch[] = L"no-registration"; |
26 | 30 |
27 // Causes the test executable to just run the web server and quit when the | 31 // Causes the test executable to just run the web server and quit when the |
28 // server is killed. Useful for debugging tests. | 32 // server is killed. Useful for debugging tests. |
29 const wchar_t kRunAsServer[] = L"server"; | 33 const wchar_t kRunAsServer[] = L"server"; |
30 | 34 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 // leaves that chrome frame registered once the tests are done. It must be | 69 // leaves that chrome frame registered once the tests are done. It must be |
66 // constructed AFTER the TestSuite is created since TestSuites create THE | 70 // constructed AFTER the TestSuite is created since TestSuites create THE |
67 // AtExitManager. | 71 // AtExitManager. |
68 // TODO(robertshield): Make these tests restore the original registration | 72 // TODO(robertshield): Make these tests restore the original registration |
69 // once done. | 73 // once done. |
70 ScopedChromeFrameRegistrar registrar; | 74 ScopedChromeFrameRegistrar registrar; |
71 | 75 |
72 return test_suite.Run(); | 76 return test_suite.Run(); |
73 } | 77 } |
74 } | 78 } |
OLD | NEW |