diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 00:34:38 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 00:34:38 +0000 |
| commit | 5df01d5f04f31bdb1ab3d03aa8559fa57f371edf (patch) | |
| tree | b729838ed42831e9a3b727de6a16c2c108de5bbf /content/test/content_test_launcher.cc | |
| parent | 4981d053220a3467f50ccb4f83e8e4127446288f (diff) | |
| download | chromium_src-5df01d5f04f31bdb1ab3d03aa8559fa57f371edf.zip chromium_src-5df01d5f04f31bdb1ab3d03aa8559fa57f371edf.tar.gz chromium_src-5df01d5f04f31bdb1ab3d03aa8559fa57f371edf.tar.bz2 | |
Move around some ScopedOleInitializers in hopes of reducing the number of duplicate initializations, which are noticeable now that I've added logging for them.
BUG=none
TEST=Fewer "Multiple OleInitialize..." messages in tests
TBR=phajdan.jr
Review URL: https://codereview.chromium.org/11036010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159815 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, 0 insertions, 5 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 82798be..1f2bece 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -21,7 +21,6 @@ #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 { @@ -78,10 +77,6 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase { return new ShellContentClient(); } -#if defined(OS_WIN) - ui::ScopedOleInitializer ole_initializer_; -#endif - DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite); }; |