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

Unified Diff: ui/views/controls/table/table_view_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/ui.gyp ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/table/table_view_unittest.cc
diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc
index ad5dec03e4b5b72a1512e2682ce8c6d53d4b9753..5532bc3ff929b6e20f0f66328d6ff332468dec42 100644
--- a/ui/views/controls/table/table_view_unittest.cc
+++ b/ui/views/controls/table/table_view_unittest.cc
@@ -17,6 +17,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/models/table_model.h"
#include "ui/base/models/table_model_observer.h"
+#include "ui/base/win/scoped_ole_initializer.h"
#include "ui/views/controls/table/table_view.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -174,10 +175,10 @@ class TableViewTest : public testing::Test, views::WidgetDelegate {
private:
MessageLoopForUI message_loop_;
views::Widget* window_;
+ ui::ScopedOleInitializer ole_initializer_;
};
void TableViewTest::SetUp() {
- OleInitialize(NULL);
model_.reset(CreateModel());
std::vector<ui::TableColumn> columns;
columns.resize(2);
@@ -194,7 +195,6 @@ void TableViewTest::TearDown() {
window_->Close();
// Temporary workaround to avoid leak of RootView::pending_paint_task_.
message_loop_.RunAllPending();
- OleUninitialize();
}
void TableViewTest::VerifyViewOrder(int first, ...) {
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698