diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 01:32:15 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 01:32:15 +0000 |
| commit | 3289a82a55e7dbc9badac7d503e11ba5d5cb334c (patch) | |
| tree | 37a614e52cc65256314821bb77a46c723312ab3d /ui | |
| parent | 1680547c393e3be66f7537a950635dd087e088de (diff) | |
| download | chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.zip chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.tar.gz chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.tar.bz2 | |
Eliminate duplicate COM and OLE initializations.
This is take 2; the original patch ( http://crrev.com/159815 ), which only dealt with OLE, broke a few tests. The OneClickSignIn tests were skipping the RenderViewHostTestHarness SetUp() method, while the Accessibility tests directly muck with Widgets and thus have to manually init OLE.
BUG=none
TEST=Fewer "Multiple OleInitialize..." messages in tests
Review URL: https://codereview.chromium.org/11031059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/test/aura_test_helper.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h index 2345f5c..d064a84 100644 --- a/ui/aura/test/aura_test_helper.h +++ b/ui/aura/test/aura_test_helper.h @@ -8,10 +8,6 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#if defined(OS_WIN) -#include "ui/base/win/scoped_ole_initializer.h" -#endif - class MessageLoopForUI; namespace ui { @@ -62,10 +58,6 @@ class AuraTestHelper { scoped_ptr<FocusManager> focus_manager_; scoped_ptr<aura::TestScreen> test_screen_; -#if defined(OS_WIN) - ui::ScopedOleInitializer ole_initializer_; -#endif - DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); }; |