5 files changed, 14 insertions, 0 deletions
diff --git a/components/about_handler/OWNERS b/components/about_handler/OWNERS
new file mode 100644
index 0000000..e48155c
--- /dev/null
+++ b/components/about_handler/OWNERS
@@ -0,0 +1,2 @@
+mmenke@chromium.org
+davidben@chromium.org
diff --git a/components/about_handler/url_request_about_job.cc b/components/about_handler/url_request_about_job.cc
index 880685a..71e7c1e 100644
--- a/components/about_handler/url_request_about_job.cc
+++ b/components/about_handler/url_request_about_job.cc
@@ -30,6 +30,11 @@ void URLRequestAboutJob::Start() {
       base::Bind(&URLRequestAboutJob::StartAsync, weak_factory_.GetWeakPtr()));
 }
 
+void URLRequestAboutJob::Kill() {
+  weak_factory_.InvalidateWeakPtrs();
+  URLRequestJob::Kill();
+}
+
 bool URLRequestAboutJob::GetMimeType(std::string* mime_type) const {
   *mime_type = "text/html";
   return true;
diff --git a/components/about_handler/url_request_about_job.h b/components/about_handler/url_request_about_job.h
index e37c568..d7a445d 100644
--- a/components/about_handler/url_request_about_job.h
+++ b/components/about_handler/url_request_about_job.h
@@ -20,6 +20,7 @@ class URLRequestAboutJob : public net::URLRequestJob {
 
   // URLRequestJob:
   void Start() override;
+  void Kill() override;
   bool GetMimeType(std::string* mime_type) const override;
 
  private:
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index efbf424..c2a75c1 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -28,6 +28,11 @@ void URLRequestErrorJob::Start() {
       base::Bind(&URLRequestErrorJob::StartAsync, weak_factory_.GetWeakPtr()));
 }
 
+void URLRequestErrorJob::Kill() {
+  weak_factory_.InvalidateWeakPtrs();
+  URLRequestJob::Kill();
+}
+
 void URLRequestErrorJob::StartAsync() {
   NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, error_));
 }
diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h
index 059db26..efd6b66 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -21,6 +21,7 @@ class NET_EXPORT URLRequestErrorJob : public URLRequestJob {
                      int error);
 
   void Start() override;
+  void Kill() override;
 
  private:
   ~URLRequestErrorJob() override;