diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 10:24:28 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 10:24:28 +0000 |
| commit | c987d131e493908aa92d583d8c5da5844a8a6b2b (patch) | |
| tree | 6f484611b8707497cf6d33c55c8b532f38d87ed5 /chrome_frame | |
| parent | 85b48b0e6879d7bddb5a6befc77c7d7c9e08607b (diff) | |
| download | chromium_src-c987d131e493908aa92d583d8c5da5844a8a6b2b.zip chromium_src-c987d131e493908aa92d583d8c5da5844a8a6b2b.tar.gz chromium_src-c987d131e493908aa92d583d8c5da5844a8a6b2b.tar.bz2 | |
Revert 121852 - Fix COM initialization in chrome_frame_tests.exe when built with the ATL included with VS2010.
BUG=114609
TEST=chrome_frame_tests.exe
Review URL: http://codereview.chromium.org/9391014
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9360038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/run_all_unittests.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc index 5a0e40a..6a1aa1b 100644 --- a/chrome_frame/test/run_all_unittests.cc +++ b/chrome_frame/test/run_all_unittests.cc @@ -8,7 +8,6 @@ #include "base/process_util.h" #include "base/test/test_suite.h" #include "base/threading/platform_thread.h" -#include "base/win/scoped_com_initializer.h" #include "chrome/common/chrome_paths.h" #include "chrome_frame/crash_server_init.h" #include "chrome_frame/test/chrome_frame_test_utils.h" @@ -19,6 +18,10 @@ // To enable ATL-based code to run in this module class ChromeFrameUnittestsModule : public CAtlExeModuleT<ChromeFrameUnittestsModule> { + public: + static HRESULT InitializeCom() { + return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + } }; ChromeFrameUnittestsModule _AtlModule; @@ -31,7 +34,6 @@ void PureCall() { } int main(int argc, char **argv) { - base::win::ScopedCOMInitializer com_initializer; ScopedChromeFrameRegistrar::RegisterAndExitProcessIfDirected(); base::EnableTerminationOnHeapCorruption(); base::PlatformThread::SetName("ChromeFrame tests"); |