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

chrome/browser/net/gaia/gaia_oauth_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/browser/net/gaia/gaia_oauth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.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/gaia/oauth_request_signer.h"
 #include "chrome/common/net/http_return.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "content/common/net/url_fetcher.h"
 #include "grit/chromium_strings.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 
 static const char kOAuthTokenCookie[] = "oauth_token";
 
 GaiaOAuthFetcher::GaiaOAuthFetcher(GaiaOAuthConsumer* consumer,
                                    net::URLRequestContextGetter* getter,
@@ skipping 18 matching lines @@
   fetch_pending_ = false;
 }
 
 // static
 URLFetcher* GaiaOAuthFetcher::CreateGaiaFetcher(
     net::URLRequestContextGetter* getter,
     const GURL& gaia_gurl,
     const std::string& body,
     const std::string& headers,
     bool send_cookies,
-    URLFetcher::Delegate* delegate) {
+    content::URLFetcherDelegate* delegate) {
   bool empty_body = body.empty();
   URLFetcher* result =
       URLFetcher::Create(0,
                          gaia_gurl,
                          empty_body ? URLFetcher::GET : URLFetcher::POST,
                          delegate);
   result->set_request_context(getter);
 
   // The Gaia/OAuth token exchange requests do not require any cookie-based
   // identification as part of requests.  We suppress sending any cookies to
@@ skipping 571 matching lines @@
   if (status.is_success() && response_code == RC_REQUEST_OK) {
     std::string email;
     ParseUserInfoResponse(data, &email);
     VLOG(1) << "GAIA user info fetched for " << email << ".";
     consumer_->OnUserInfoSuccess(email);
   } else {
     consumer_->OnUserInfoFailure(GenerateAuthError(data, status));
   }
 }
 
-void GaiaOAuthFetcher::OnURLFetchComplete(const URLFetcher* source,
-                                          const GURL& url,
-                                          const net::URLRequestStatus& status,
-                                          int response_code,
-                                          const net::ResponseCookies& cookies,
-                                          const std::string& data) {
+void GaiaOAuthFetcher::OnURLFetchComplete(const URLFetcher* source) {
   // Keep |fetcher_| around to avoid invalidating its |status| (accessed below).
   scoped_ptr<URLFetcher> current_fetcher(fetcher_.release());
   fetch_pending_ = false;
   GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
+  GURL url = source->url();
+  std::string data;
+  source->GetResponseAsString(&data);
+  net::URLRequestStatus status = source->status();
+  int response_code = source->response_code();
   if (StartsWithASCII(url.spec(), gaia_urls->get_oauth_token_url(), true)) {
-    OnGetOAuthTokenUrlFetched(cookies, status, response_code);
+    OnGetOAuthTokenUrlFetched(source->cookies(), status, response_code);
   } else if (url.spec() == gaia_urls->oauth1_login_url()) {
     OnOAuthLoginFetched(data, status, response_code);
   } else if (url.spec() == gaia_urls->oauth_get_access_token_url()) {
     OnOAuthGetAccessTokenFetched(data, status, response_code);
   } else if (url.spec() == gaia_urls->oauth_wrap_bridge_url()) {
     OnOAuthWrapBridgeFetched(data, status, response_code);
   } else if (url.spec() == gaia_urls->oauth_user_info_url()) {
     OnUserInfoFetched(data, status, response_code);
   } else if (StartsWithASCII(url.spec(),
                              gaia_urls->oauth_revoke_token_url(),
                              true)) {
     OnOAuthRevokeTokenFetched(data, status, response_code);
   } else {
     NOTREACHED();
   }
 }
 
 bool GaiaOAuthFetcher::ShouldAutoFetch(AutoFetchLimit fetch_step) {
   return fetch_step <= auto_fetch_limit_;
 }