diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:32:34 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:32:34 +0000 |
| commit | bec08d7ad993f82975e0cec80bb9d7e711c38cdd (patch) | |
| tree | 46b513655d993d71fcc434861e16f0af28c39d83 /chrome/test/base/view_event_test_base.cc | |
| parent | d8e73bdf182614e9893e898e6358c262ea50a749 (diff) | |
| download | chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.zip chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.tar.gz chromium_src-bec08d7ad993f82975e0cec80bb9d7e711c38cdd.tar.bz2 | |
Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9664069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/view_event_test_base.cc')
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index de2bb32..baa6569 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -4,10 +4,6 @@ #include "chrome/test/base/view_event_test_base.h" -#if defined(OS_WIN) -#include <ole2.h> -#endif - #include "base/bind.h" #include "base/bind_helpers.h" #include "base/message_loop.h" @@ -82,9 +78,6 @@ void ViewEventTestBase::Done() { } void ViewEventTestBase::SetUp() { -#if defined(OS_WIN) - OleInitialize(NULL); -#endif ui::CompositorTestSupport::Initialize(); #if defined(USE_AURA) ash::Shell::CreateInstance(NULL); @@ -107,9 +100,6 @@ void ViewEventTestBase::TearDown() { aura::Env::DeleteInstance(); #endif ui::CompositorTestSupport::Terminate(); -#if defined(OS_WIN) - OleUninitialize(); -#endif } bool ViewEventTestBase::CanResize() const { |