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

chrome/common/net/gaia/gaia_auth_fetcher.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.
 
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/net/http_return.h"
+#include "content/common/net/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 // TODO(chron): Add sourceless version of this formatter.
 // static
 const char GaiaAuthFetcher::kClientLoginFormat[] =
     "Email=%s&"
     "Passwd=%s&"
@@ skipping 93 matching lines @@
   fetcher_.reset();
   fetch_pending_ = false;
 }
 
 // static
 URLFetcher* GaiaAuthFetcher::CreateGaiaFetcher(
     net::URLRequestContextGetter* getter,
     const std::string& body,
     const GURL& gaia_gurl,
     bool send_cookies,
-    URLFetcher::Delegate* delegate) {
+    content::URLFetcherDelegate* delegate) {
 
   URLFetcher* to_return =
       URLFetcher::Create(0,
                          gaia_gurl,
                          URLFetcher::POST,
                          delegate);
   to_return->set_request_context(getter);
   to_return->set_upload_data("application/x-www-form-urlencoded", body);
 
   // The Gaia token exchange requests do not require any cookie-based
@@ skipping 429 matching lines @@
 void GaiaAuthFetcher::OnMergeSessionFetched(const std::string& data,
                                             const net::URLRequestStatus& status,
                                             int response_code) {
   if (status.is_success() && response_code == RC_REQUEST_OK) {
     consumer_->OnMergeSessionSuccess(data);
   } else {
     consumer_->OnMergeSessionFailure(GenerateAuthError(data, status));
   }
 }
 
-void GaiaAuthFetcher::OnURLFetchComplete(const URLFetcher* source,
-                                         const GURL& url,
-                                         const net::URLRequestStatus& status,
-                                         int response_code,
-                                         const net::ResponseCookies& cookies,
-                                         const std::string& data) {
+void GaiaAuthFetcher::OnURLFetchComplete(const URLFetcher* source) {
   fetch_pending_ = false;
+  const GURL& url = source->url();
+  const net::URLRequestStatus& status = source->status();
+  int response_code = source->response_code();
+  std::string data;
+  source->GetResponseAsString(&data);
   if (url == client_login_gurl_) {
     OnClientLoginFetched(data, status, response_code);
   } else if (url == issue_auth_token_gurl_) {
     OnIssueAuthTokenFetched(data, status, response_code);
   } else if (url == get_user_info_gurl_) {
     OnGetUserInfoFetched(data, status, response_code);
   } else if (url == token_auth_gurl_) {
     OnTokenAuthFetched(data, status, response_code);
   } else if (url == merge_session_gurl_ ||
       (source && source->original_url() == merge_session_gurl_)) {
     // MergeSession may redirect, so check the original URL of the fetcher.
     OnMergeSessionFetched(data, status, response_code);
   } else {
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }