Force deletion of test_shell's RequestProxy on the IO thread.

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2012 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 254 matching lines @@
   bool download_to_file;
   scoped_refptr<net::UploadData> upload;
 };
 
 // The interval for calls to RequestProxy::MaybeUpdateUploadProgress
 static const int kUpdateUploadProgressIntervalMsec = 100;
 
 // The RequestProxy does most of its work on the IO thread.  The Start and
 // Cancel methods are proxied over to the IO thread, where an net::URLRequest
 // object is instantiated.
-class RequestProxy : public net::URLRequest::Delegate,
-                     public base::RefCountedThreadSafe<RequestProxy> {
+struct DeleteOnIOThread;  // See below.
+class RequestProxy
+    : public net::URLRequest::Delegate,
+      public base::RefCountedThreadSafe<RequestProxy, DeleteOnIOThread> {
  public:
   // Takes ownership of the params.
   RequestProxy()
       : download_to_file_(false),
         file_stream_(NULL),
         buf_(new net::IOBuffer(kDataSize)),
         last_upload_position_(0) {
   }
 
   void DropPeer() {
@@ skipping 12 matching lines @@
   }
 
   void Cancel() {
     // proxy over to the io thread
     g_io_thread->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&RequestProxy::AsyncCancel, this));
   }
 
  protected:
+  friend class base::DeleteHelper<RequestProxy>;
   friend class base::RefCountedThreadSafe<RequestProxy>;
+  friend struct DeleteOnIOThread;
 
   virtual ~RequestProxy() {
-    // If we have a request, then we'd better be on the io thread!
-    DCHECK(!request_.get() ||
-           MessageLoop::current() == g_io_thread->message_loop());
+    // Ensure we are deleted on the IO thread because base::Timer requires that.
+    // (guaranteed by the Traits class template parameter).
+    DCHECK(MessageLoop::current() == g_io_thread->message_loop());
   }
 
   // --------------------------------------------------------------------------
   // The following methods are called on the owner's thread in response to
   // various net::URLRequest callbacks.  The event hooks, defined below, trigger
   // these methods asynchronously.
 
   void NotifyReceivedRedirect(const GURL& new_url,
                               const ResourceResponseInfo& info) {
     bool has_new_first_party_for_cookies = false;
@@ skipping 419 matching lines @@
   // Info used to determine whether or not to send an upload progress update.
   uint64 last_upload_position_;
   base::TimeTicks last_upload_ticks_;
 
   // Save the real FILE URL prefix for the FILE URL which converts to HTTP URL.
   std::string file_url_prefix_;
   // Save a failed file request status to pass it to webkit.
   scoped_ptr<net::URLRequestStatus> failed_file_request_status_;
 };
 
+// Helper guaranteeing deletion on the IO thread (like
+// content::BrowserThread::DeleteOnIOThread, but without the dependency).
+struct DeleteOnIOThread {
+  static void Destruct(const RequestProxy* obj) {
+    if (MessageLoop::current() == g_io_thread->message_loop())
+      delete obj;
+    else
+      g_io_thread->message_loop()->DeleteSoon(FROM_HERE, obj);
+  }
+};
+
 //-----------------------------------------------------------------------------
 
 class SyncRequestProxy : public RequestProxy {
  public:
   explicit SyncRequestProxy(ResourceLoaderBridge::SyncLoadResponse* result)
       : result_(result), event_(true, false) {
   }
 
   void WaitForCompletion() {
     event_.Wait();
@@ skipping 336 matching lines @@
          (http_prefix.SchemeIs("http") || http_prefix.SchemeIs("https")));
   g_file_over_http_params = new FileOverHTTPParams(file_path_template,
                                                    http_prefix);
 }
 
 // static
 webkit_glue::ResourceLoaderBridge* SimpleResourceLoaderBridge::Create(
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return new ResourceLoaderBridgeImpl(request_info);
 }