diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 17:14:48 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 17:14:48 +0000 |
| commit | 451fd90d924b6fd4e6f208952b525cab2029cd6d (patch) | |
| tree | 6cf9bec9c237224f6d70de9ea5c1cee7d31cd63f /content/plugin | |
| parent | 748d7a09fe3c109b5a829ebabdc97edd347f42e6 (diff) | |
| download | chromium_src-451fd90d924b6fd4e6f208952b525cab2029cd6d.zip chromium_src-451fd90d924b6fd4e6f208952b525cab2029cd6d.tar.gz chromium_src-451fd90d924b6fd4e6f208952b525cab2029cd6d.tar.bz2 | |
Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we do consistent logging and error-checking at all these sites.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11050009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/plugin_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 696a5d6..d31f016 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -5,7 +5,6 @@ #include "build/build_config.h" #if defined(OS_WIN) -#include <objbase.h> #include <windows.h> #endif @@ -22,6 +21,7 @@ #include "content/public/common/main_function_params.h" #if defined(OS_WIN) +#include "base/win/scoped_com_initializer.h" #include "content/public/common/injection_test_win.h" #include "sandbox/win/src/sandbox.h" #elif defined(OS_POSIX) && !defined(OS_MACOSX) @@ -118,7 +118,8 @@ int PluginMain(const content::MainFunctionParams& parameters) { sandbox::TargetServices* target_services = parameters.sandbox_info->target_services; - CoInitialize(NULL); + base::win::ScopedCOMInitializer com_initializer; + DVLOG(1) << "Started plugin with " << parsed_command_line.GetCommandLineString(); @@ -183,7 +184,6 @@ int PluginMain(const content::MainFunctionParams& parameters) { #if defined(OS_WIN) DestroyIMEForFlash(); - CoUninitialize(); #endif return 0; |