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

chrome/browser/chromeos/login/mock_url_fetchers.h

Index: chrome/browser/chromeos/login/mock_url_fetchers.h
===================================================================
--- chrome/browser/chromeos/login/mock_url_fetchers.h	(revision 107268)
+++ chrome/browser/chromeos/login/mock_url_fetchers.h	(working copy)
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
 
@@ -23,12 +23,12 @@
 
 // Simulates a URL fetch by posting a delayed task. This fetch expects to be
 // canceled, and fails the test if it is not
-class ExpectCanceledFetcher : public URLFetcher {
+class ExpectCanceledFetcher : public TestURLFetcher {
  public:
   ExpectCanceledFetcher(bool success,
                         const GURL& url,
                         const std::string& results,
-                        URLFetcher::RequestType request_type,
+                        content::URLFetcher::RequestType request_type,
                         content::URLFetcherDelegate* d);
   virtual ~ExpectCanceledFetcher();
 
@@ -41,78 +41,57 @@
   DISALLOW_COPY_AND_ASSIGN(ExpectCanceledFetcher);
 };
 
-class GotCanceledFetcher : public URLFetcher {
+class GotCanceledFetcher : public TestURLFetcher {
  public:
   GotCanceledFetcher(bool success,
                      const GURL& url,
                      const std::string& results,
-                     URLFetcher::RequestType request_type,
+                     content::URLFetcher::RequestType request_type,
                      content::URLFetcherDelegate* d);
   virtual ~GotCanceledFetcher();
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-
  private:
-  GURL url_;
-  net::URLRequestStatus status_;
-
   DISALLOW_COPY_AND_ASSIGN(GotCanceledFetcher);
 };
 
-class SuccessFetcher : public URLFetcher {
+class SuccessFetcher : public TestURLFetcher {
  public:
   SuccessFetcher(bool success,
                  const GURL& url,
                  const std::string& results,
-                 URLFetcher::RequestType request_type,
+                 content::URLFetcher::RequestType request_type,
                  content::URLFetcherDelegate* d);
   virtual ~SuccessFetcher();
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-
  private:
-  GURL url_;
-  net::URLRequestStatus status_;
-
   DISALLOW_COPY_AND_ASSIGN(SuccessFetcher);
 };
 
-class FailFetcher : public URLFetcher {
+class FailFetcher : public TestURLFetcher {
  public:
   FailFetcher(bool success,
               const GURL& url,
               const std::string& results,
-              URLFetcher::RequestType request_type,
+              content::URLFetcher::RequestType request_type,
               content::URLFetcherDelegate* d);
   virtual ~FailFetcher();
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-
  private:
-  GURL url_;
-  net::URLRequestStatus status_;
-
   DISALLOW_COPY_AND_ASSIGN(FailFetcher);
 };
 
-class CaptchaFetcher : public URLFetcher {
+class CaptchaFetcher : public TestURLFetcher {
  public:
   CaptchaFetcher(bool success,
                  const GURL& url,
                  const std::string& results,
-                 URLFetcher::RequestType request_type,
+                 content::URLFetcher::RequestType request_type,
                  content::URLFetcherDelegate* d);
   virtual ~CaptchaFetcher();
 
@@ -122,47 +101,26 @@
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-  virtual bool GetResponseAsString(
-      std::string* out_response_string) const OVERRIDE;
-
  private:
   static const char kCaptchaToken[];
   static const char kCaptchaUrlBase[];
   static const char kCaptchaUrlFragment[];
   static const char kUnlockUrl[];
-  GURL url_;
-  net::URLRequestStatus status_;
-  std::string data_;
-
   DISALLOW_COPY_AND_ASSIGN(CaptchaFetcher);
 };
 
-class HostedFetcher : public URLFetcher {
+class HostedFetcher : public TestURLFetcher {
  public:
   HostedFetcher(bool success,
                 const GURL& url,
                 const std::string& results,
-                URLFetcher::RequestType request_type,
+                content::URLFetcher::RequestType request_type,
                 content::URLFetcherDelegate* d);
   virtual ~HostedFetcher();
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-  virtual bool GetResponseAsString(
-      std::string* out_response_string) const OVERRIDE;
-
  private:
-  GURL url_;
-  net::URLRequestStatus status_;
-  int response_code_;
-  std::string data_;
-
   DISALLOW_COPY_AND_ASSIGN(HostedFetcher);
 };