base::Bind: Cleanup in automation.

chrome/browser/automation/url_request_automation_job.cc

 // 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.
 
 #include "chrome/browser/automation/url_request_automation_job.h"
 
+#include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/common/automation_messages.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "net/base/cookie_monster.h"
@@ skipping 37 matching lines @@
     AutomationResourceMessageFilter* filter,
     bool is_pending)
     : net::URLRequestJob(request),
       id_(0),
       tab_(tab),
       message_filter_(filter),
       pending_buf_size_(0),
       redirect_status_(0),
       request_id_(request_id),
       is_pending_(is_pending),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
   DCHECK(message_filter_ != NULL);
 
   if (message_filter_) {
     id_ = message_filter_->NewAutomationRequestId();
     DCHECK_NE(id_, 0);
   }
 }
 
 URLRequestAutomationJob::~URLRequestAutomationJob() {
   DVLOG(1) << "URLRequestAutomationJob delete. Count: " << --instance_count_;
   Cleanup();
 }
 
-bool URLRequestAutomationJob::EnsureProtocolFactoryRegistered() {
+void URLRequestAutomationJob::EnsureProtocolFactoryRegistered() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!is_protocol_factory_registered_) {
     old_http_factory_ =
         net::URLRequest::Deprecated::RegisterProtocolFactory(
             "http", &URLRequestAutomationJob::Factory);
     old_https_factory_ =
         net::URLRequest::Deprecated::RegisterProtocolFactory(
             "https", &URLRequestAutomationJob::Factory);
     is_protocol_factory_registered_ = true;
   }
-
-  return true;
 }
 
 net::URLRequestJob* URLRequestAutomationJob::Factory(
     net::URLRequest* request,
     const std::string& scheme) {
   bool scheme_is_http = request->url().SchemeIs("http");
   bool scheme_is_https = request->url().SchemeIs("https");
 
   // Returning null here just means that the built-in handler will be used.
   if (scheme_is_http || scheme_is_https) {
@@ skipping 20 matching lines @@
   return NULL;
 }
 
 // net::URLRequestJob Implementation.
 void URLRequestAutomationJob::Start() {
   if (!is_pending()) {
     // Start reading asynchronously so that all error reporting and data
     // callbacks happen as they would for network requests.
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        method_factory_.NewRunnableMethod(
-            &URLRequestAutomationJob::StartAsync));
+        base::Bind(&URLRequestAutomationJob::StartAsync,
+                   weak_factory_.GetWeakPtr()));
   } else {
     // If this is a pending job, then register it immediately with the message
     // filter so it can be serviced later when we receive a request from the
     // external host to connect to the corresponding external tab.
     message_filter_->RegisterRequest(this);
   }
 }
 
 void URLRequestAutomationJob::Kill() {
   if (message_filter_.get()) {
@@ skipping 17 matching lines @@
 
   pending_buf_ = buf;
   pending_buf_size_ = buf_size;
 
   if (message_filter_) {
     message_filter_->Send(new AutomationMsg_RequestRead(tab_, id_, buf_size));
     SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
   } else {
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        method_factory_.NewRunnableMethod(
-            &URLRequestAutomationJob::NotifyJobCompletionTask));
+        base::Bind(&URLRequestAutomationJob::NotifyJobCompletionTask,
+                   weak_factory_.GetWeakPtr()));
   }
   return false;
 }
 
 bool URLRequestAutomationJob::GetMimeType(std::string* mime_type) const {
   if (!mime_type_.empty()) {
     *mime_type = mime_type_;
   } else if (headers_) {
     headers_->GetMimeType(mime_type);
   }
@@ skipping 305 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }