Move content::URLFetcher static functions to net::URLFetcher

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>
 
 #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/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.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/url_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/referrer.h"
-#include "content/public/common/url_fetcher.h"
 #include "grit/chromium_strings.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
+#include "net/url_request/url_fetcher.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,
                                    Profile* profile,
                                    const std::string& service_scope)
@@ skipping 18 matching lines @@
 
 // static
 net::URLFetcher* GaiaOAuthFetcher::CreateGaiaFetcher(
     net::URLRequestContextGetter* getter,
     const GURL& gaia_gurl,
     const std::string& body,
     const std::string& headers,
     bool send_cookies,
     net::URLFetcherDelegate* delegate) {
   bool empty_body = body.empty();
-  net::URLFetcher* result = content::URLFetcher::Create(
+  net::URLFetcher* result = net::URLFetcher::Create(
       0, gaia_gurl,
       empty_body ? net::URLFetcher::GET : net::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 626 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_;
 }