Remove content::URLFetcherDelegate

chrome/browser/net/gaia/gaia_oauth_fetcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_
 #define CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
+#include "net/url_request/url_fetcher_delegate.h"
 
 struct ChromeCookieDetails;
 
 class Browser;
 class Profile;
 
 namespace net {
 class URLRequestContextGetter;

[wtc, 2012/05/22 17:26:38]

Should we forward declare URLFetcher here?

[akalin, 2012/05/22 21:07:05]

Done.

 class URLRequestStatus;
 typedef std::vector<std::string> ResponseCookies;
 }
 
 // Authenticate a user using Gaia's OAuth1 and OAuth2 support.
 //
 // Users of this class typically desire an OAuth2 Access token scoped for a
 // specific service.  This will typically start with either an interactive
 // login, using StartGetOAuthToken, or with a long-lived OAuth1 all-scope
 // token obtained through a previous login or other means, using
 // StartOAuthGetAccessToken.  In fact, one can start with any of these
 // routines:
 //   StartGetOAuthToken()
 //   StartOAuthGetAccessToken()
 //   StartOAuthWrapBridge()
 //   StartUserInfo()
 // with the expectation that each of these calls the next Start* routine in
 // the sequence, except for StartUserInfo as it's the last one.
 //
 // This class can handle one request at a time, and all calls through an
 // instance should be serialized.
-class GaiaOAuthFetcher : public content::URLFetcherDelegate,
+class GaiaOAuthFetcher : public net::URLFetcherDelegate,
                          public content::NotificationObserver {
  public:
   // Defines steps of OAuth process performed by this class.
   typedef enum {
     OAUTH1_LOGIN,
     OAUTH1_REQUEST_TOKEN,
     OAUTH1_ALL_ACCESS_TOKEN,
     OAUTH2_SERVICE_ACCESS_TOKEN,
     USER_INFO,
     OAUTH2_REVOKE_TOKEN,
@@ skipping 70 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Called when a cookie, e. g. oauth_token, changes
   virtual void OnCookieChanged(Profile* profile,
                                ChromeCookieDetails* cookie_details);
 
   // Called when a cookie, e. g. oauth_token, changes
   virtual void OnBrowserClosing(Browser* profile,
                                 bool detail);
 
-  // Implementation of content::URLFetcherDelegate
+  // Implementation of net::URLFetcherDelegate
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // StartGetOAuthToken (or other Start* routine) been called, but results
   // are not back yet.
   virtual bool HasPendingFetch() const;
 
   // Stop any URL fetches in progress.
   virtual void CancelRequest();
 
  protected:
@@ skipping 80 matching lines @@
       const std::string& oauth1_access_token_secret);
 
   // Given parameters, create a OAuthWrapBridge request body.
   static std::string MakeOAuthWrapBridgeBody(
       const std::string& oauth1_access_token,
       const std::string& oauth1_access_token_secret,
       const std::string& wrap_token_duration,
       const std::string& oauth2_service_scope);
 
   // Create a fetcher useable for making any Gaia OAuth request.
-  static content::URLFetcher* CreateGaiaFetcher(
+  static net::URLFetcher* 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 ShouldAutoFetch(RequestType fetch_step);
 
   // These fields are common to GaiaOAuthFetcher, same every request
   GaiaOAuthConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
   Profile* profile_;
   Browser* popup_;
   content::NotificationRegistrar registrar_;
 
   // While a fetch is going on:
-  scoped_ptr<content::URLFetcher> fetcher_;
+  scoped_ptr<net::URLFetcher> fetcher_;
   std::string request_body_;
   std::string request_headers_;
   std::string service_scope_;
   bool fetch_pending_;
   RequestType auto_fetch_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaOAuthFetcher);
 };
 
 #endif  // CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_