Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1062)

Unified Diff: chrome/test/base/view_event_test_base.cc

Issue 9664069: Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/view_event_test_base.h ('k') | chrome_frame/test/net/fake_external_tab.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index de2bb32f880d8d70425a7a000e5ca88c11b7f3d6..baa65693c88181d82ecf3a43c0fc4e8bb15c7156 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 {
« no previous file with comments | « chrome/test/base/view_event_test_base.h ('k') | chrome_frame/test/net/fake_external_tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698