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

Unified Diff: ui/views/widget/native_widget_win_unittest.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/views/test/views_test_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_win_unittest.cc
diff --git a/ui/views/widget/native_widget_win_unittest.cc b/ui/views/widget/native_widget_win_unittest.cc
index 9ad5ecb2269faba40450db84f075ce857f64e80e..7808b3b25e916bfa14058031e9107fa3c8e7f872 100644
--- a/ui/views/widget/native_widget_win_unittest.cc
+++ b/ui/views/widget/native_widget_win_unittest.cc
@@ -8,19 +8,15 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/win/scoped_ole_initializer.h"
namespace views {
namespace {
class NativeWidgetWinTest : public testing::Test {
public:
- NativeWidgetWinTest() {
- OleInitialize(NULL);
- }
-
- ~NativeWidgetWinTest() {
- OleUninitialize();
- }
+ NativeWidgetWinTest() {}
+ ~NativeWidgetWinTest() {}
virtual void TearDown() {
// Flush the message loop because we have pending release tasks
@@ -38,6 +34,7 @@ class NativeWidgetWinTest : public testing::Test {
private:
MessageLoopForUI message_loop_;
+ ui::ScopedOleInitializer ole_initializer_;
DISALLOW_COPY_AND_ASSIGN(NativeWidgetWinTest);
};
« no previous file with comments | « ui/views/test/views_test_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698