Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/common/net/gaia/gaia_oauth_client_unittest.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.
 //
 // A complete set of unit tests for GaiaOAuthClient.
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/common/net/gaia/gaia_oauth_client.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace {
 // Responds as though OAuth returned from the server.
 class MockOAuthFetcher : public URLFetcher {
  public:
   MockOAuthFetcher(int response_code,
                    int max_failure_count,
                    const GURL& url,
                    const std::string& results,
                    URLFetcher::RequestType request_type,
-                   URLFetcher::Delegate* d)
+                   content::URLFetcherDelegate* d)
     : URLFetcher(url, request_type, d),
       response_code_(response_code),
       max_failure_count_(max_failure_count),
       current_failure_count_(0),
       url_(url),
       results_(results) { }
   virtual ~MockOAuthFetcher() { }
 
   virtual void Start() {
     if ((response_code_ != RC_REQUEST_OK) && (max_failure_count_ != -1) &&
         (current_failure_count_ == max_failure_count_)) {
       response_code_ = RC_REQUEST_OK;
     }
 
     net::URLRequestStatus::Status code = net::URLRequestStatus::SUCCESS;
     if (response_code_ != RC_REQUEST_OK) {
       code = net::URLRequestStatus::FAILED;
       current_failure_count_++;
     }
-    net::URLRequestStatus status(code, 0);
-    delegate()->OnURLFetchComplete(this,
-                                   url_,
-                                   status,
-                                   response_code_,
-                                   net::ResponseCookies(),
-                                   results_);
+    status_ = net::URLRequestStatus(code, 0);
+
+    delegate()->OnURLFetchComplete(this);
+  }
+
+  virtual const GURL& url() const {
+    return url_;
+  }
+
+  virtual const net::URLRequestStatus& status() const {
+    return status_;
+  }
+
+  virtual int response_code() const {
+    return response_code_;
+  }
+
+  virtual bool GetResponseAsString(std::string* out_response_string) const {
+    *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,
                                 public ScopedURLFetcherFactory {
  public:
   MockOAuthFetcherFactory()
       : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         response_code_(RC_REQUEST_OK) {
   }
   ~MockOAuthFetcherFactory() {}
   virtual URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
       URLFetcher::RequestType request_type,
-      URLFetcher::Delegate* d) {
+      content::URLFetcherDelegate* d) {
     return new MockOAuthFetcher(
         response_code_,
         max_failure_count_,
         url,
         results_,
         request_type,
         d);
   }
   void set_response_code(int response_code) {
     response_code_ = response_code;
@@ skipping 144 matching lines @@
   factory.set_results(kDummyRefreshTokenResult);
 
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", -1, &delegate);
 }
 }  // namespace gaia