Make test URLFetcher implementations not derive from the URLFetcher implementation, since we want...

content/public/common/url_fetcher.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_URL_FETCHER_H_
 #define CONTENT_PUBLIC_COMMON_URL_FETCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/platform_file.h"
+#include "base/memory/ref_counted.h"

[wtc, 2011/10/26 23:34:46]

Nit: list this header before "base/platform_file.h".

[jam, 2011/10/26 23:39:06]

Done.

 #include "content/common/content_export.h"
 
 class FilePath;
 class GURL;
 
 namespace base {
 class MessageLoopProxy;
 class TimeDelta;
 }
 
@@ skipping 52 matching lines @@
     HEAD,
   };
 
   // |url| is the URL to send the request to.
   // |request_type| is the type of request to make.
   // |d| the object that will receive the callback on fetch completion.
   static URLFetcher* Create(const GURL& url,
                             RequestType request_type,
                             URLFetcherDelegate* d);
 
-  // Like above, but if there's a Factory registered with the implementation it
-  // will be used. |id| may be used during testing to identify who is creating
-  // the URLFetcher.
+  // Like above, but if there's a URLFetcherFactory registered with the
+  // implementation it will be used. |id| may be used during testing to identify
+  // who is creating the URLFetcher.
   static URLFetcher* Create(int id,
                             const GURL& url,
                             RequestType request_type,
                             content::URLFetcherDelegate* d);
 
   // Cancels all existing URLFetchers.  Will notify the URLFetcherDelegates.
   // Note that any new URLFetchers created while this is running will not be
   // cancelled.  Typically, one would call this in the CleanUp() method of an IO
   // thread, so that no new URLRequests would be able to start on the IO thread
   // anyway.  This doesn't prevent new URLFetchers from trying to post to the IO
@@ skipping 53 matching lines @@
   // after backoff_delay() elapses. URLFetcher has it set to true by default.
   virtual void SetAutomaticallyRetryOn5xx(bool retry) = 0;
 
   virtual void SetMaxRetries(int max_retries) = 0;
   virtual int GetMaxRetries() const = 0;
 
   // Returns the back-off delay before the request will be retried,
   // when a 5xx response was received.
   virtual base::TimeDelta GetBackoffDelay() const = 0;
 
-  // Sets the back-off delay, allowing to mock 5xx requests in unit-tests.
-  virtual void SetBackoffDelayForTesting(base::TimeDelta backoff_delay) = 0;

[wtc, 2011/10/26 23:34:46]

This change should be mentioned in the CL's commit message.
(I found that this method now becomes TestURLFetcher::set_backoff_delay.)

[jam, 2011/10/26 23:39:06]

I had just added this method to the interface in my last cl, and now I moved it
back to set_backoff_delay now that tests don't derive from URLFetcher, so I
didn't think it was worth calling out

-
   // By default, the response is saved in a string. Call this method to save the
   // response to a temporary file instead. Must be called before Start().
   // |file_message_loop_proxy| will be used for all file operations.
   virtual void SaveResponseToTemporaryFile(
       scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy) = 0;
 
   // Retrieve the response headers from the request.  Must only be called after
   // the OnURLFetchComplete callback has run.
   virtual net::HttpResponseHeaders* GetResponseHeaders() const = 0;
 
@@ skipping 12 matching lines @@
   virtual void Start() = 0;
 
   // Restarts the URLFetcher with a new URLRequestContextGetter.
   virtual void StartWithRequestContextGetter(
       net::URLRequestContextGetter* request_context_getter) = 0;
 
   // Return the URL that we were asked to fetch.
   virtual const GURL& GetOriginalUrl() const = 0;
 
   // Return the URL that this fetcher is processing.
   virtual const GURL& GetUrl() const = 0;

[wtc, 2011/10/27 21:29:16]

Nit: these two methods should be named GetOriginalURL
and GetURL, in keeping with the way "URL" is spelled in
URLFetcher.

[jam, 2011/10/27 22:34:41]

good point. done.

 
   // The status of the URL fetch.
   virtual const net::URLRequestStatus& GetStatus() const = 0;
 
   // The http response code received. Will return RESPONSE_CODE_INVALID
   // if an error prevented any response from being received.
   virtual int GetResponseCode() const = 0;
 
   // Cookies recieved.
   virtual const net::ResponseCookies& GetCookies() const = 0;
@@ skipping 16 matching lines @@
   // true, caller takes responsibility for the temp file, and it will not
   // be removed once the URLFetcher is destroyed.  User should not take
   // ownership more than once, or call this method after taking ownership.
   virtual bool GetResponseAsFilePath(bool take_ownership,
                                      FilePath* out_response_path) const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_URL_FETCHER_H_