summaryrefslogtreecommitdiffstats
path: root/chrome/views/focus_manager_unittest.cc
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-30 20:50:51 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-30 20:50:51 +0000
commitc7f4b627c4dde3c801649e28eea82e581797590c (patch)
treeb1044b55a28089f8eaaa529355413fa02e0494a2 /chrome/views/focus_manager_unittest.cc
parent777c7bff9d40214069752a8ca91ade106a60536b (diff)
downloadchromium_src-c7f4b627c4dde3c801649e28eea82e581797590c.zip
chromium_src-c7f4b627c4dde3c801649e28eea82e581797590c.tar.gz
chromium_src-c7f4b627c4dde3c801649e28eea82e581797590c.tar.bz2
Fix some issues found looking at the code.
Patch from Gaetano Mendola <mendola@gmail.com> Original review: http://codereview.chromium.org/4273 I added some additions on my part and two unit test fix due to the added DCHECK. Reduced atl header inclusion. Review URL: http://codereview.chromium.org/5009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/focus_manager_unittest.cc')
-rw-r--r--chrome/views/focus_manager_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index 8f0040f..78d02b4 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -514,6 +514,7 @@ TestViewWindow* FocusManagerTest::GetWindow() {
}
void FocusManagerTest::SetUp() {
+ OleInitialize(NULL);
test_window_ = new TestViewWindow(this);
test_window_->Init();
ShowWindow(test_window_->GetHWND(), SW_SHOW);
@@ -524,6 +525,7 @@ void FocusManagerTest::TearDown() {
// Flush the message loop to make Purify happy.
message_loop_.RunAllPending();
+ OleUninitialize();
}
////////////////////////////////////////////////////////////////////////////////