From 255620da4ddf6f59947d9e77529f54ad02d9af12 Mon Sep 17 00:00:00 2001 From: "earthdok@chromium.org" Date: Mon, 19 Aug 2013 13:14:29 +0000 Subject: Remove WorkerPool dependency from URLRequestFileJob. Make net::URLRequestFileJob pass a TaskRunner to FileStream, instead of using a deprecated FileStream constructor that depends on WorkerPool. This TaskRunner is obtained from the blocking pool where possible. Also, remove two explicit uses of WorkerPool in net/url_request/ and chrome/browser/. Removes dependency on deprecated code. Also fixes memory leaks in unit tests caused by FileStream destruction tasks not running to completion in WorkerPool. BUG=248513, 251774 Review URL: https://chromiumcodereview.appspot.com/22795006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218273 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/load_timing_browsertest.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'chrome/browser/net/load_timing_browsertest.cc') diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 75da353..51963fe 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -13,6 +13,7 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" +#include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" @@ -119,10 +120,13 @@ class MockUrlRequestJobWithTiming : public net::URLRequestFileJob { net::NetworkDelegate* network_delegate, const base::FilePath& path, const TimingDeltas& load_timing_deltas) - : net::URLRequestFileJob(request, network_delegate, path), + : net::URLRequestFileJob( + request, network_delegate, path, + content::BrowserThread::GetBlockingPool()-> + GetTaskRunnerWithShutdownBehavior( + base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)), load_timing_deltas_(load_timing_deltas), - weak_factory_(this) { - } + weak_factory_(this) {} // net::URLRequestFileJob implementation: virtual void Start() OVERRIDE { -- cgit v1.1