diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 00:22:51 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 00:22:51 +0000 |
| commit | cb56912d1e7b2df6951cd71a53966d1b3787cc6e (patch) | |
| tree | 12da60f85375c70ba40e1c3d34fcc2a98f11fe47 /content/test/content_test_launcher.cc | |
| parent | cd086922706af472be11ebe5d4643bc660eb8a38 (diff) | |
| download | chromium_src-cb56912d1e7b2df6951cd71a53966d1b3787cc6e.zip chromium_src-cb56912d1e7b2df6951cd71a53966d1b3787cc6e.tar.gz chromium_src-cb56912d1e7b2df6951cd71a53966d1b3787cc6e.tar.bz2 | |
Revert 159815 - Move around some ScopedOleInitializers in hopes of reducing the number of duplicate initializations, which are noticeable now that I've added logging for them.
I'm trying to track down a mysterious XP-only failure in OneClickSigninHelperTest.
If reverting this change doesn't fix the problem, I'll un-revert.
BUG=none
TEST=Fewer "Multiple OleInitialize..." messages in tests
TBR=phajdan.jr
Review URL: https://codereview.chromium.org/11036010
TBR=pkasting@chromium.org
Review URL: https://codereview.chromium.org/11030020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
| -rw-r--r-- | content/test/content_test_launcher.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 1f2bece..82798be 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -21,6 +21,7 @@ #if defined(OS_WIN) #include "content/public/app/startup_helper_win.h" #include "sandbox/win/src/sandbox_types.h" +#include "ui/base/win/scoped_ole_initializer.h" #endif // defined(OS_WIN) namespace content { @@ -77,6 +78,10 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase { return new ShellContentClient(); } +#if defined(OS_WIN) + ui::ScopedOleInitializer ole_initializer_; +#endif + DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite); }; |