From 3289a82a55e7dbc9badac7d503e11ba5d5cb334c Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Tue, 23 Oct 2012 01:32:15 +0000 Subject: 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 --- ui/aura/test/aura_test_helper.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ui') 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 focus_manager_; scoped_ptr test_screen_; -#if defined(OS_WIN) - ui::ScopedOleInitializer ole_initializer_; -#endif - DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); }; -- cgit v1.1