summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 18:24:19 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 18:24:19 +0000
commit65c03a0d3f341785989199b5fc2263e8cd41b3cc (patch)
tree810a5a6935f1bf18bd4fa4f78687bd69f222fe01 /chrome
parent672d3865e2e1be7eb0d3e16c9cede48f84c99ed2 (diff)
downloadchromium_src-65c03a0d3f341785989199b5fc2263e8cd41b3cc.zip
chromium_src-65c03a0d3f341785989199b5fc2263e8cd41b3cc.tar.gz
chromium_src-65c03a0d3f341785989199b5fc2263e8cd41b3cc.tar.bz2
Stop refcounting URLRequestMockNetErrorJob.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6998005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/net/url_request_mock_net_error_job.cc11
-rw-r--r--chrome/browser/net/url_request_mock_net_error_job.h5
2 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index 0cf0df3..aad92c2 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -7,8 +7,10 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/message_loop.h"
+#include "base/task.h"
#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
@@ -86,15 +88,18 @@ URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(net::URLRequest* request,
const FilePath& file_path)
: URLRequestMockHTTPJob(request, file_path),
errors_(errors),
- ssl_cert_(cert) {
+ ssl_cert_(cert),
+ ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
}
URLRequestMockNetErrorJob::~URLRequestMockNetErrorJob() {
}
void URLRequestMockNetErrorJob::Start() {
- MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
- this, &URLRequestMockNetErrorJob::StartAsync));
+ MessageLoop::current()->PostTask(
+ FROM_HERE,
+ method_factory_.NewRunnableMethod(
+ &URLRequestMockNetErrorJob::StartAsync));
}
void URLRequestMockNetErrorJob::StartAsync() {
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 33b1fc0..874a3d1 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,6 +10,7 @@
#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
#pragma once
+#include "base/task.h"
#include "chrome/browser/net/url_request_mock_http_job.h"
class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
@@ -53,6 +54,8 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
typedef std::map<GURL, MockInfo> URLMockInfoMap;
static URLMockInfoMap url_mock_info_map_;
+ ScopedRunnableMethodFactory<URLRequestMockNetErrorJob> method_factory_;
+
DISALLOW_COPY_AND_ASSIGN(URLRequestMockNetErrorJob);
};