RESUBMIT of http://codereview.chromium.org/404025/show

Start the WebKit thread when we initialize the resource
dispatcher host.

NOTE: It's very possible this will have a startup
performance impact. I'm going to watch the bots after
committing.

TODO: Clean up shutdown logic that exists simply
because we don't know whether or not we'll ever start
the WebKit thread.

Originally landed in r33063, reverted in r33101 due to
coincidence with Modules Linux startup test failures.

TBR=jorlow, darin
TEST=The WebKit thread gets spun up early in the
initialization process.
BUG=24144,28364

Review URL: http://codereview.chromium.org/441025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33144 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 3b0f99e..7203cd9 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -286,6 +286,7 @@ ResourceDispatcherHost::~ResourceDispatcherHost() {
 
 void ResourceDispatcherHost::Initialize() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  webkit_thread_->Initialize();
   safe_browsing_->Initialize();
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 301a2a1..4feed71 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -320,8 +320,7 @@ void CheckSuccessfulRequest(const std::vector<IPC::Message>& messages,
 }
 
 // Tests whether many messages get dispatched properly.
-// TODO(jorlow): Re-enable once bug 28364 is fixed.
-TEST_F(ResourceDispatcherHostTest, DISABLED_TestMany) {
+TEST_F(ResourceDispatcherHostTest, TestMany) {
   EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
 
   MakeTestRequest(0, 1, URLRequestTestJob::test_url_1());
@@ -347,8 +346,7 @@ TEST_F(ResourceDispatcherHostTest, DISABLED_TestMany) {
 
 // Tests whether messages get canceled properly. We issue three requests,
 // cancel one of them, and make sure that each sent the proper notifications.
-// TODO(jorlow): Re-enable once bug 28364 is fixed.
-TEST_F(ResourceDispatcherHostTest, DISABLED_Cancel) {
+TEST_F(ResourceDispatcherHostTest, Cancel) {
   EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
 
   MakeTestRequest(0, 1, URLRequestTestJob::test_url_1());
@@ -608,8 +606,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsProcessDies) {
 // away.  Note that we rely on Purify for finding the leaks if any.
 // If this test turns the Purify bot red, check the ResourceDispatcherHost
 // destructor to make sure the blocked requests are deleted.
-// TODO(jorlow): Re-enable once bug 28364 is fixed.
-TEST_F(ResourceDispatcherHostTest, DISABLED_TestBlockedRequestsDontLeak) {
+TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsDontLeak) {
   // This second receiver is used to emulate a second process.
   ForwardingReceiver second_receiver(this);