summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:18:45 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:18:45 +0000
commit6e948a40ee9134cfba48eb6d007378a4f4c11a8d (patch)
treede4f6ec194b99f162e612462805692ba9445f35d /chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
parentd7fc97946625fee2c54e18bce4f61608efeeef03 (diff)
downloadchromium_src-6e948a40ee9134cfba48eb6d007378a4f4c11a8d.zip
chromium_src-6e948a40ee9134cfba48eb6d007378a4f4c11a8d.tar.gz
chromium_src-6e948a40ee9134cfba48eb6d007378a4f4c11a8d.tar.bz2
Revert 32608 - RESUBMIT of http://src.chromium.org/viewvc/chrome?view=rev&revision=32319 with unit test fixes.
Reverting this as this caused a number of valgrind test failures. Make the WebKitThread object start the WebKit thread on construction (not lazily). 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. TEST=The WebKit thread gets spun up early in the initialization process. BUG=24144 Review URL: http://codereview.chromium.org/404025 TBR=jorlow@chromium.org Review URL: http://codereview.chromium.org/427001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 8a3c7ef..301a2a1 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -148,16 +148,10 @@ class ResourceDispatcherHostTest : public testing::Test,
public:
ResourceDispatcherHostTest()
: Receiver(ChildProcessInfo::RENDER_PROCESS, -1),
- io_thread_(new ChromeThread(ChromeThread::IO, &message_loop_)),
+ io_thread_(ChromeThread::IO, &message_loop_),
old_factory_(NULL) {
set_handle(base::GetCurrentProcessHandle());
}
-
- ~ResourceDispatcherHostTest() {
- // The IO thread must get destroyed before the resource dispatcher host.
- io_thread_.reset();
- }
-
// ResourceDispatcherHost::Receiver implementation
virtual bool Send(IPC::Message* msg) {
accum_.AddMessage(*msg);
@@ -251,7 +245,7 @@ class ResourceDispatcherHostTest : public testing::Test,
}
MessageLoopForIO message_loop_;
- scoped_ptr<ChromeThread> io_thread_;
+ ChromeThread io_thread_;
ResourceDispatcherHost host_;
ResourceIPCAccumulator accum_;
std::string response_headers_;