summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 03:40:01 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 03:40:01 +0000
commit574de276b0b39820961f7cf03cf23e0389878a4a (patch)
tree514ea70beafa3f416f8ac6d25ffb6ea58fe014b7 /chrome_frame
parentd98d47f08a0fe13528a58d1c70b42df3fcbb98bf (diff)
downloadchromium_src-574de276b0b39820961f7cf03cf23e0389878a4a.zip
chromium_src-574de276b0b39820961f7cf03cf23e0389878a4a.tar.gz
chromium_src-574de276b0b39820961f7cf03cf23e0389878a4a.tar.bz2
Initialize the chrome thread object at the start of the CFUrlRequestUnittestRunner constructor.
This causes a CHECK to fire in the extensions service initialization which happens when we initialize the profile. The CHECK was added in revision 30550. Given the spate of these test failures we should really speed up the process of moving the chrome frame builder to the main waterfall. TBR=tommi Review URL: http://codereview.chromium.org/346019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 53ac162..63ddf87 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -142,14 +142,14 @@ void FakeExternalTab::Shutdown() {
CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
: NetTestSuite(argc, argv),
chrome_frame_html_("/chrome_frame", kChromeFrameHtml) {
- fake_chrome_.Initialize();
- pss_subclass_.reset(new ProcessSingletonSubclass(this));
- EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
- StartChromeFrameInHostBrowser();
// Register the main thread by instantiating it, but don't call any methods.
main_thread_.reset(new ChromeThread(ChromeThread::UI,
MessageLoop::current()));
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ fake_chrome_.Initialize();
+ pss_subclass_.reset(new ProcessSingletonSubclass(this));
+ EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
+ StartChromeFrameInHostBrowser();
}
CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() {