Remove content::URLFetcherDelegate

chrome/browser/chromeos/gdata/gdata_operations.h

Index: chrome/browser/chromeos/gdata/gdata_operations.h
diff --git a/chrome/browser/chromeos/gdata/gdata_operations.h b/chrome/browser/chromeos/gdata/gdata_operations.h
index c87af734546bb1b3f63c43536913facc52ff4059..8152a03fcc104443c67c4f1069158b18b0cf5219 100644
--- a/chrome/browser/chromeos/gdata/gdata_operations.h
+++ b/chrome/browser/chromeos/gdata/gdata_operations.h
@@ -21,6 +21,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_fetcher.h"
 
 namespace gdata {
 
@@ -82,7 +83,7 @@ class GDataOperationInterface {
 // Base class for operations that are fetching URLs.
 class UrlFetchOperationBase : public GDataOperationInterface,
                               public GDataOperationRegistry::Operation,
-                              public content::URLFetcherDelegate {
+                              public net::URLFetcherDelegate {
  public:
   // Overridden from GDataOperationInterface.
   virtual void Start(const std::string& auth_token) OVERRIDE;
@@ -103,7 +104,7 @@ class UrlFetchOperationBase : public GDataOperationInterface,
   virtual GURL GetURL() const = 0;
   // Returns the request type. A derived class should override this method
   // for a request type other than HTTP GET.
-  virtual content::URLFetcher::RequestType GetRequestType() const;
+  virtual net::URLFetcher::RequestType GetRequestType() const;
   // Returns the extra HTTP headers for the request. A derived class should
   // override this method to specify any extra headers needed for the request.
   virtual std::vector<std::string> GetExtraRequestHeaders() const;
@@ -144,7 +145,7 @@ class UrlFetchOperationBase : public GDataOperationInterface,
   int re_authenticate_count_;
   bool save_temp_file_;
   FilePath output_file_path_;
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
   bool started_;
 };
 
@@ -270,7 +271,7 @@ class DownloadFileOperation : public UrlFetchOperationBase {
       OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
-  // Overridden from content::URLFetcherDelegate.
+  // Overridden from net::URLFetcherDelegate.
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64 current, int64 total) OVERRIDE;
   virtual bool ShouldSendDownloadData() OVERRIDE;
@@ -299,7 +300,7 @@ class DeleteDocumentOperation : public EntryActionOperation {
 
  protected:
   // Overridden from EntryActionOperation.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
@@ -322,7 +323,7 @@ class CreateDirectoryOperation : public GetDataOperation {
  protected:
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
   virtual bool GetContentData(std::string* upload_content_type,
@@ -349,7 +350,7 @@ class CopyDocumentOperation : public GetDataOperation {
 
  protected:
   // Overridden from GetDataOperation.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
@@ -377,7 +378,7 @@ class RenameResourceOperation : public EntryActionOperation {
 
  protected:
   // Overridden from EntryActionOperation.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
@@ -408,7 +409,7 @@ class AddResourceToDirectoryOperation : public EntryActionOperation {
   virtual GURL GetURL() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
 
@@ -437,7 +438,7 @@ class RemoveResourceFromDirectoryOperation : public EntryActionOperation {
   virtual GURL GetURL() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
@@ -467,7 +468,7 @@ class InitiateUploadOperation : public UrlFetchOperationBase {
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
@@ -501,7 +502,7 @@ class ResumeUploadOperation : public UrlFetchOperationBase {
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
-  virtual content::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;