diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 05:52:33 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 05:52:33 +0000 |
| commit | 3429e58d3540e6973db5a7661cbbd2dd1997ac61 (patch) | |
| tree | f2cccb493a33f25eaf504d98e6936fb05a43c424 /chrome/test/browser_with_test_window_test.cc | |
| parent | 36cd42f16e38b8ed0133d71f503848b4577d402f (diff) | |
| download | chromium_src-3429e58d3540e6973db5a7661cbbd2dd1997ac61.zip chromium_src-3429e58d3540e6973db5a7661cbbd2dd1997ac61.tar.gz chromium_src-3429e58d3540e6973db5a7661cbbd2dd1997ac61.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
Review URL: http://codereview.chromium.org/279004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29253 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.cc | 4 |
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( |