Make test URLFetcher implementations not derive from the URLFetcher implementation, since we want to hide that from chrome completely.

SetBackoffDelayForTesting moves from content::UrlFetcher to TestURLFetcher, now that the test objects derive from it.

BUG=98716
Review URL: http://codereview.chromium.org/8395038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107468 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 39 insertions, 95 deletions

diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index 941ae74..bcef282 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -32,22 +32,22 @@ using ::testing::_;
 MockFetcher::MockFetcher(bool success,
                          const GURL& url,
                          const std::string& results,
-                         URLFetcher::RequestType request_type,
+                         content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
-    : URLFetcher(url, request_type, d),
-      url_(url),
-      results_(results) {
+    : TestURLFetcher(0, url, request_type, d) {
+  set_url(url);
   net::URLRequestStatus::Status code;
   
   if (success) {
-    response_code_ = RC_REQUEST_OK;
+    set_response_code(RC_REQUEST_OK);
     code = net::URLRequestStatus::SUCCESS;
   } else {
-    response_code_ = RC_FORBIDDEN;
+    set_response_code(RC_FORBIDDEN);
     code = net::URLRequestStatus::FAILED;
   }
 
-  status_ = net::URLRequestStatus(code, 0);
+  set_status(net::URLRequestStatus(code, 0));
+  SetResponseString(results);
 }
 
 MockFetcher::MockFetcher(const GURL& url,
@@ -55,14 +55,14 @@ MockFetcher::MockFetcher(const GURL& url,
                          int response_code,
                          const net::ResponseCookies& cookies,
                          const std::string& results,
-                         URLFetcher::RequestType request_type,
+                         content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
-  : URLFetcher(url, request_type, d),
-    url_(url),
-    status_(status),
-    response_code_(response_code),
-    cookies_(cookies),
-    results_(results) {
+    : TestURLFetcher(0, url, request_type, d) {
+  set_url(url);
+  set_status(status);
+  set_response_code(response_code);
+  set_cookies(cookies);
+  SetResponseString(results);
 }
 
 MockFetcher::~MockFetcher() {}
@@ -71,28 +71,6 @@ void MockFetcher::Start() {
   delegate()->OnURLFetchComplete(this);
 }
 
-const GURL& MockFetcher::GetUrl() const {
-  return url_;
-}
-
-const net::URLRequestStatus& MockFetcher::GetStatus() const {
-  return status_;
-}
-
-int MockFetcher::GetResponseCode() const {
-  return response_code_;
-}
-
-const net::ResponseCookies& MockFetcher::GetCookies() const {
-  return cookies_;
-}
-
-bool MockFetcher::GetResponseAsString(std::string* out_response_string) const {
-  *out_response_string = results_;
-  return true;
-}
-
-
 class GaiaAuthFetcherTest : public testing::Test {
  public:
   GaiaAuthFetcherTest()
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
index dbc377a..3e6173f 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
@@ -17,17 +17,13 @@
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 
-namespace content {
-class URLFetcherDelegate;
-}
-
 // Responds as though ClientLogin returned from the server.
-class MockFetcher : public URLFetcher {
+class MockFetcher : public TestURLFetcher {
  public:
   MockFetcher(bool success,
               const GURL& url,
               const std::string& results,
-              URLFetcher::RequestType request_type,
+              content::URLFetcher::RequestType request_type,
               content::URLFetcherDelegate* d);
 
   MockFetcher(const GURL& url,
@@ -35,30 +31,19 @@ class MockFetcher : public URLFetcher {
               int response_code,
               const net::ResponseCookies& cookies,
               const std::string& results,
-              URLFetcher::RequestType request_type,
+              content::URLFetcher::RequestType request_type,
               content::URLFetcherDelegate* d);
 
   virtual ~MockFetcher();
 
   virtual void Start();
 
-  virtual const GURL& GetUrl() const OVERRIDE;
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-  virtual const net::ResponseCookies& GetCookies() const OVERRIDE;
-  virtual bool GetResponseAsString(std::string* out_response_string) const;
-
  private:
-  GURL url_;
-  net::URLRequestStatus status_;
-  int response_code_;
-  net::ResponseCookies cookies_;
-  std::string results_;
   DISALLOW_COPY_AND_ASSIGN(MockFetcher);
 };
 
 template<typename T>
-class MockFactory : public URLFetcher::Factory,
+class MockFactory : public content::URLFetcherFactory,
                     public ScopedURLFetcherFactory {
  public:
   MockFactory()
@@ -66,10 +51,11 @@ class MockFactory : public URLFetcher::Factory,
         success_(true) {
   }
   ~MockFactory() {}
-  URLFetcher* CreateURLFetcher(int id,
-                               const GURL& url,
-                               URLFetcher::RequestType request_type,
-                               content::URLFetcherDelegate* d) {
+  content::URLFetcher* CreateURLFetcher(
+      int id,
+      const GURL& url,
+      content::URLFetcher::RequestType request_type,
+      content::URLFetcherDelegate* d) OVERRIDE {
     return new T(success_, url, results_, request_type, d);
   }
   void set_success(bool success) {
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index bccb172..593917f 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -25,67 +25,47 @@ using ::testing::_;
 
 namespace {
 // Responds as though OAuth returned from the server.
-class MockOAuthFetcher : public URLFetcher {
+class MockOAuthFetcher : public TestURLFetcher {
  public:
   MockOAuthFetcher(int response_code,
                    int max_failure_count,
                    const GURL& url,
                    const std::string& results,
-                   URLFetcher::RequestType request_type,
+                   content::URLFetcher::RequestType request_type,
                    content::URLFetcherDelegate* d)
-    : URLFetcher(url, request_type, d),
-      response_code_(response_code),
+    : TestURLFetcher(0, url, request_type, d),
       max_failure_count_(max_failure_count),
-      current_failure_count_(0),
-      url_(url),
-      results_(results) { }
+      current_failure_count_(0) {
+    set_url(url);
+    set_response_code(response_code);
+    SetResponseString(results);
+  }
+
   virtual ~MockOAuthFetcher() { }
 
   virtual void Start() {
-    if ((response_code_ != RC_REQUEST_OK) && (max_failure_count_ != -1) &&
+    if ((GetResponseCode() != RC_REQUEST_OK) && (max_failure_count_ != -1) &&
         (current_failure_count_ == max_failure_count_)) {
-      response_code_ = RC_REQUEST_OK;
+      set_response_code(RC_REQUEST_OK);
     }
 
     net::URLRequestStatus::Status code = net::URLRequestStatus::SUCCESS;
-    if (response_code_ != RC_REQUEST_OK) {
+    if (GetResponseCode() != RC_REQUEST_OK) {
       code = net::URLRequestStatus::FAILED;
       current_failure_count_++;
     }
-    status_ = net::URLRequestStatus(code, 0);
+    set_status(net::URLRequestStatus(code, 0));
 
     delegate()->OnURLFetchComplete(this);
   }
 
-  virtual const GURL& GetUrl() const OVERRIDE {
-    return url_;
-  }
-
-  virtual const net::URLRequestStatus& GetStatus() const OVERRIDE {
-    return status_;
-  }
-
-  virtual int GetResponseCode() const OVERRIDE {
-    return response_code_;
-  }
-
-  virtual bool GetResponseAsString(
-      std::string* out_response_string) const OVERRIDE {
-    *out_response_string = results_;
-    return true;
-  }
-
  private:
-  net::URLRequestStatus status_;
-  int response_code_;
   int max_failure_count_;
   int current_failure_count_;
-  GURL url_;
-  std::string results_;
   DISALLOW_COPY_AND_ASSIGN(MockOAuthFetcher);
 };
 
-class MockOAuthFetcherFactory : public URLFetcher::Factory,
+class MockOAuthFetcherFactory : public content::URLFetcherFactory,
                                 public ScopedURLFetcherFactory {
  public:
   MockOAuthFetcherFactory()
@@ -93,10 +73,10 @@ class MockOAuthFetcherFactory : public URLFetcher::Factory,
         response_code_(RC_REQUEST_OK) {
   }
   ~MockOAuthFetcherFactory() {}
-  virtual URLFetcher* CreateURLFetcher(
+  virtual content::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      URLFetcher::RequestType request_type,
+      content::URLFetcher::RequestType request_type,
       content::URLFetcherDelegate* d) {
     return new MockOAuthFetcher(
         response_code_,