summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-19 20:18:03 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-19 20:18:03 +0000
commit199b9fecc3564e005560f0853e8654ba377ec376 (patch)
tree72b792809300fcd043ceda90fbed8e059cadfd42 /chrome_frame
parentdd343e8403444f34d7ec648c7f8bdb1b7e432820 (diff)
downloadchromium_src-199b9fecc3564e005560f0853e8654ba377ec376.zip
chromium_src-199b9fecc3564e005560f0853e8654ba377ec376.tar.gz
chromium_src-199b9fecc3564e005560f0853e8654ba377ec376.tar.bz2
Attempt to fix the chrome frame net test failures on the try server. A DCHECK indicating
that the RegisterDragDrop API which registers the drop target as part of the chrome widget initialization fails with E_OUTOFMEMORY. Reason the chrome frame net tests were using CoInitializeEx to initialize the COM apartment. As per docs we need to call OleInitialize. BUG=none TEST=chrome frame net tests should pass on the try server. TBR=amit Review URL: http://codereview.chromium.org/6026003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index c5625c2..0d6c15b 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -343,7 +343,6 @@ void CFUrlRequestUnittestRunner::OnInitialTabLoaded() {
void CFUrlRequestUnittestRunner::RunMainUIThread() {
DCHECK(MessageLoop::current());
DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
- OleInitialize(NULL);
MessageLoop::current()->Run();
}
@@ -467,6 +466,14 @@ void FilterDisabledTests() {
// We need a module since some of the accessibility code that gets pulled
// in here uses ATL.
class ObligatoryModule: public CAtlExeModuleT<ObligatoryModule> {
+ public:
+ static HRESULT InitializeCom() {
+ return OleInitialize(NULL);
+ }
+
+ static void UninitializeCom() {
+ OleUninitialize();
+ }
};
ObligatoryModule g_obligatory_atl_module;