Remove content::URLFetcherDelegate

chrome/browser/net/gaia/gaia_oauth_fetcher.cc

 // Copyright (c) 2012 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>
 
@@ skipping 42 matching lines @@
 bool GaiaOAuthFetcher::HasPendingFetch() const {
   return fetch_pending_;
 }
 
 void GaiaOAuthFetcher::CancelRequest() {
   fetcher_.reset();
   fetch_pending_ = false;
 }
 
 // static
-content::URLFetcher* GaiaOAuthFetcher::CreateGaiaFetcher(
+net::URLFetcher* GaiaOAuthFetcher::CreateGaiaFetcher(
     net::URLRequestContextGetter* getter,
     const GURL& gaia_gurl,
     const std::string& body,
     const std::string& headers,
     bool send_cookies,
-    content::URLFetcherDelegate* delegate) {
+    net::URLFetcherDelegate* delegate) {
   bool empty_body = body.empty();
-  content::URLFetcher* result = content::URLFetcher::Create(
+  net::URLFetcher* result = content::URLFetcher::Create(
       0, gaia_gurl,
       empty_body ? content::URLFetcher::GET : content::URLFetcher::POST,
       delegate);
   result->SetRequestContext(getter);
 
   // The Gaia/OAuth token exchange requests do not require any cookie-based
   // identification as part of requests.  We suppress sending any cookies to
   // maintain a separation between the user's browsing and Chrome's internal
   // services.  Where such mixing is desired (prelogin, autologin
   // or chromeos login), it will be done explicitly.
@@ skipping 594 matching lines @@
       consumer_->OnUserInfoSuccess(email);
       return;
     }
   }
   consumer_->OnUserInfoFailure(GenerateAuthError(data, status,
                                                  response_code));
 }
 
 void GaiaOAuthFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
   // Keep |fetcher_| around to avoid invalidating its |status| (accessed below).
-  scoped_ptr<content::URLFetcher> current_fetcher(fetcher_.release());
+  scoped_ptr<net::URLFetcher> current_fetcher(fetcher_.release());
   fetch_pending_ = false;
   std::string data;
   source->GetResponseAsString(&data);
   net::URLRequestStatus status = source->GetStatus();
   int response_code = source->GetResponseCode();
 
   switch (request_type_) {
     case OAUTH1_LOGIN:
       OnOAuthLoginFetched(data, status, response_code);
       break;
@@ skipping 11 matching lines @@
       break;
     case OAUTH2_REVOKE_TOKEN:
       OnOAuthRevokeTokenFetched(data, status, response_code);
       break;
   }
 }
 
 bool GaiaOAuthFetcher::ShouldAutoFetch(RequestType fetch_step) {
   return fetch_step <= auto_fetch_limit_;
 }