summaryrefslogtreecommitdiffstats
path: root/chrome/test/browser_with_test_window_test.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 10:32:04 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 10:32:04 +0000
commitd80033e69d9542605fed21da06601f8201da6618 (patch)
treea38c7f88776664f80679d181baf1c1ad266d857d /chrome/test/browser_with_test_window_test.cc
parent185046805f294b0294311d09a3fe75f52e4554d8 (diff)
downloadchromium_src-d80033e69d9542605fed21da06601f8201da6618.zip
chromium_src-d80033e69d9542605fed21da06601f8201da6618.tar.gz
chromium_src-d80033e69d9542605fed21da06601f8201da6618.tar.bz2
Made sync code build and pass unit tests on OS X.
Major changes: - Moved sync_setup_{flow,wizard} to sync directory. - Made browser_with_test_window_test compile on non-Windows platform. - Moved localized contents font util functions to app/. BUG=23073 TEST=trybot Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29253 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29255 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29258 Review URL: http://codereview.chromium.org/279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/browser_with_test_window_test.cc')
-rw-r--r--chrome/test/browser_with_test_window_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 3e3fb93..8dede7c 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -12,7 +12,9 @@
BrowserWithTestWindowTest::BrowserWithTestWindowTest()
: rph_factory_(),
rvh_factory_(&rph_factory_) {
+#if defined(OS_WIN)
OleInitialize(NULL);
+#endif
}
void BrowserWithTestWindowTest::SetUp() {
@@ -38,7 +40,9 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
MessageLoop::current()->Run();
+#if defined(OS_WIN)
OleUninitialize();
+#endif
}
TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(