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

Unified Diff: chrome/test/base/browser_with_test_window_test.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/browser_with_test_window_test.h ('k') | chrome/test/base/chrome_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/browser_with_test_window_test.cc
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 1595939253305e80438980a9623df4a425f06477..590db4bd86daa5506a14b28e4482d1a18c8528e2 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -4,10 +4,6 @@
#include "chrome/test/base/browser_with_test_window_test.h"
-#if defined(OS_WIN)
-#include <ole2.h>
-#endif // defined(OS_WIN)
-
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -36,9 +32,6 @@ BrowserWithTestWindowTest::BrowserWithTestWindowTest()
BrowserThread::FILE_USER_BLOCKING, message_loop()),
rph_factory_(),
rvh_factory_(&rph_factory_) {
-#if defined(OS_WIN)
- OleInitialize(NULL);
-#endif
}
void BrowserWithTestWindowTest::SetUp() {
@@ -74,10 +67,6 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
MessageLoop::current()->Run();
-
-#if defined(OS_WIN)
- OleUninitialize();
-#endif
}
TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/chrome_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698