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

Unified Diff: ui/aura/test/aura_test_helper.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 | « ui/aura/test/aura_test_helper.h ('k') | ui/base/win/scoped_ole_initializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_helper.cc
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 4eb08ddf592920fd41454e2834dece6595bc781e..dd3f73ae88af972820692093a0a0364736fa8839 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -4,10 +4,6 @@
#include "ui/aura/test/aura_test_helper.h"
-#if defined(OS_WIN)
-#include <ole2.h>
-#endif
-
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/gfx/compositor/layer_animator.h"
@@ -18,18 +14,11 @@ namespace test {
AuraTestHelper::AuraTestHelper()
: setup_called_(false),
teardown_called_(false) {
-#if defined(OS_WIN)
- OleInitialize(NULL);
-#endif
-
// Disable animations during tests.
ui::LayerAnimator::set_disable_animations_for_test(true);
}
AuraTestHelper::~AuraTestHelper() {
-#if defined(OS_WIN)
- OleUninitialize();
-#endif
CHECK(setup_called_)
<< "You have overridden SetUp but never called super class's SetUp";
CHECK(teardown_called_)
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/base/win/scoped_ole_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698