summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/file_system_url_request_job_unittest.cc
diff options
context:
space:
mode:
authorericu@chromium.org <ericu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 21:44:27 +0000
committerericu@chromium.org <ericu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 21:44:27 +0000
commitfdbde89a6f89204cc9bdf6dc45dc03ca7f200582 (patch)
tree78629687014f9c18ee00bc95620ef80b9c93ee08 /webkit/fileapi/file_system_url_request_job_unittest.cc
parent14a2f25c462b9e2695526066497883d0f098bf8f (diff)
downloadchromium_src-fdbde89a6f89204cc9bdf6dc45dc03ca7f200582.zip
chromium_src-fdbde89a6f89204cc9bdf6dc45dc03ca7f200582.tar.gz
chromium_src-fdbde89a6f89204cc9bdf6dc45dc03ca7f200582.tar.bz2
Fix memory leaks in tests.
With the new filesystem URL parser, the invalid URLs used in the InvalidURL test are now recognized as invalid far earlier, so the job wasn't even getting requested from the factory, and so wasn't getting deleted. BUG=121571 TEST=FileSystem[Dir]URLRequestJobTest.InvalidURL under valgrind Review URL: http://codereview.chromium.org/9956121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_url_request_job_unittest.cc')
-rw-r--r--webkit/fileapi/file_system_url_request_job_unittest.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index 16986e2..b8151ac 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -98,6 +98,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
virtual void TearDown() {
net::URLRequest::Deprecated::RegisterProtocolFactory("filesystem", NULL);
+ ClearUnusedJob();
}
void OnValidateFileSystem(base::PlatformFileError result) {
@@ -194,6 +195,13 @@ class FileSystemURLRequestJobTest : public testing::Test {
return temp;
}
+ static void ClearUnusedJob() {
+ if (job_) {
+ scoped_refptr<net::URLRequestJob> deleter = job_;
+ job_ = NULL;
+ }
+ }
+
// Put the message loop at the top, so that it's the last thing deleted.
MessageLoop message_loop_;