Get rid of RequestRegistry (part 3): remove Drive path from request objects.

chrome/browser/google_apis/base_requests.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.
 //
 // This file provides base classes used to issue HTTP requests for Google
 // APIs.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_
 
@@ skipping 79 matching lines @@
                             public RequestRegistry::Request,
                             public net::URLFetcherDelegate {
  public:
   // AuthenticatedRequestInterface overrides.
   virtual void Start(const std::string& access_token,
                      const std::string& custom_user_agent,
                      const ReAuthenticateCallback& callback) OVERRIDE;
   virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() OVERRIDE;
 
  protected:
-  UrlFetchRequestBase(
-      RequestSender* runner,
-      net::URLRequestContextGetter* url_request_context_getter);
-  // Use this constructor when you need to implement requests that take a
-  // drive file path (ex. for downloading and uploading).
-  // |url_request_context_getter| is used to initialize URLFetcher.
-  // TODO(satorux): Remove the drive file path hack. crbug.com/163296
-  UrlFetchRequestBase(
-      RequestSender* runner,
-      net::URLRequestContextGetter* url_request_context_getter,
-      const base::FilePath& drive_file_path);
+  UrlFetchRequestBase(RequestSender* runner,
+                      net::URLRequestContextGetter* url_request_context_getter);
   virtual ~UrlFetchRequestBase();
 
   // Gets URL for the request.
   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 net::URLFetcher::RequestType GetRequestType() const;
 
   // Returns the extra HTTP headers for the request. A derived class should
@@ skipping 167 matching lines @@
  protected:
   // |callback| will be called with the upload URL, where upload data is
   // uploaded to with ResumeUploadRequestBase.
   // |callback| must not be null.
   // |content_type| and |content_length| should be the attributes of the
   // uploading file.
   InitiateUploadRequestBase(
       RequestSender* runner,
       net::URLRequestContextGetter* url_request_context_getter,
       const InitiateUploadCallback& callback,
-      const base::FilePath& drive_file_path,
       const std::string& content_type,
       int64 content_length);
   virtual ~InitiateUploadRequestBase();
 
   // UrlFetchRequestBase overrides.
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
   const InitiateUploadCallback callback_;
-  const base::FilePath drive_file_path_;
   const std::string content_type_;
   const int64 content_length_;
 
   DISALLOW_COPY_AND_ASSIGN(InitiateUploadRequestBase);
 };
 
 //========================== UploadRangeRequestBase ==========================
 
 // Struct for response to ResumeUpload and GetUploadStatus.
 struct UploadRangeResponse {
@@ skipping 13 matching lines @@
   int64 start_position_received;
   int64 end_position_received;
 };
 
 // Base class for a URL fetch request expecting the response containing the
 // current uploading range. This class processes the response containing
 // "Range" header and invoke OnRangeRequestComplete.
 class UploadRangeRequestBase : public UrlFetchRequestBase {
  protected:
   // |upload_location| is the URL of where to upload the file to.
-  // |drive_file_path| is the path to the file seen in the UI. Not necessary
-  // for resuming an upload, but used for adding an entry to RequestRegistry.
-  // TODO(satorux): Remove the drive file path hack. crbug.com/163296
   UploadRangeRequestBase(
       RequestSender* runner,
       net::URLRequestContextGetter* url_request_context_getter,
-      const base::FilePath& drive_file_path,
       const GURL& upload_url);
   virtual ~UploadRangeRequestBase();
 
   // UrlFetchRequestBase overrides.
   virtual GURL GetURL() const OVERRIDE;
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
   // This method will be called when the request is done, regardless of
@@ skipping 12 matching lines @@
   // Note: Subclasses should have responsibility to run some callback
   // in this method to notify the finish status to its clients (or ignore it
   // under its responsibility).
   virtual void OnRangeRequestComplete(
       const UploadRangeResponse& response, scoped_ptr<base::Value> value) = 0;
 
  private:
   // Called when ParseJson() is completed.
   void OnDataParsed(GDataErrorCode code, scoped_ptr<base::Value> value);
 
-  const base::FilePath drive_file_path_;
   const GURL upload_url_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<UploadRangeRequestBase> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(UploadRangeRequestBase);
 };
 
 //========================== ResumeUploadRequestBase =========================
 
 // This class performs the request for resuming the upload of a file.
 // More specifically, this request uploads a chunk of data carried in |buf|
 // of ResumeUploadResponseBase. This class is designed to share the
 // implementation of upload resuming between GData WAPI and Drive API v2.
 // The subclasses should implement OnRangeRequestComplete inherited by
 // UploadRangeRequestBase, because the type of the response should be
 // different (although the format in the server response is JSON).
 class ResumeUploadRequestBase : public UploadRangeRequestBase {
  protected:
   // |start_position| is the start of range of contents currently stored in
   // |buf|. |end_position| is the end of range of contents currently stared in
   // |buf|. This is exclusive. For instance, if you are to upload the first
   // 500 bytes of data, |start_position| is 0 and |end_position| is 500.
   // |content_length| and |content_type| are the length and type of the
   // file content to be uploaded respectively.
   // |buf| holds current content to be uploaded.
   // See also UploadRangeRequestBase's comment for remaining parameters
-  // meaining.
+  // meaning.
   ResumeUploadRequestBase(
       RequestSender* runner,
       net::URLRequestContextGetter* url_request_context_getter,
-      const base::FilePath& drive_file_path,
       const GURL& upload_location,
       int64 start_position,
       int64 end_position,
       int64 content_length,
       const std::string& content_type,
       const base::FilePath& local_file_path);
   virtual ~ResumeUploadRequestBase();
 
   // UrlFetchRequestBase overrides.
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
@@ skipping 24 matching lines @@
 //   for the uploaded data, if a file has been completely uploaded.
 // See also UploadRangeRequestBase.
 class GetUploadStatusRequestBase : public UploadRangeRequestBase {
  public:
   // |content_length| is the whole data size to be uploaded.
   // See also UploadRangeRequestBase's constructor comment for other
   // parameters.
   GetUploadStatusRequestBase(
       RequestSender* runner,
       net::URLRequestContextGetter* url_request_context_getter,
-      const base::FilePath& drive_file_path,
       const GURL& upload_url,
       int64 content_length);
   virtual ~GetUploadStatusRequestBase();
 
  protected:
   // UrlFetchRequestBase overrides.
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
   const int64 content_length_;
@@ skipping 23 matching lines @@
   //   This callback is called when some part of the content is
   //   read. Used to read the download content progressively. May be null.
   //
   // progress_callback:
   //   This callback is called for periodically reporting the number of bytes
   //   downloaded so far. May be null.
   //
   // download_url:
   //   Specifies the target file to download.
   //
-  // drive_file_path:
-  //   Specifies the drive path of the target file. Shown in UI.
-  //   TODO(satorux): Remove the drive file path hack. crbug.com/163296
-  //
   // output_file_path:
   //   Specifies the file path to save the downloaded file.
   //
   DownloadFileRequest(
       RequestSender* runner,
       net::URLRequestContextGetter* url_request_context_getter,
       const DownloadActionCallback& download_action_callback,
       const GetContentCallback& get_content_callback,
       const ProgressCallback& progress_callback,
       const GURL& download_url,
-      const base::FilePath& drive_file_path,
       const base::FilePath& output_file_path);
   virtual ~DownloadFileRequest();
 
  protected:
   // UrlFetchRequestBase overrides.
   virtual GURL GetURL() const OVERRIDE;
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
   // net::URLFetcherDelegate overrides.
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64 current, int64 total) OVERRIDE;
   virtual bool ShouldSendDownloadData() OVERRIDE;
   virtual void OnURLFetchDownloadData(
       const net::URLFetcher* source,
       scoped_ptr<std::string> download_data) OVERRIDE;
 
  private:
   const DownloadActionCallback download_action_callback_;
   const GetContentCallback get_content_callback_;
   const ProgressCallback progress_callback_;
   const GURL download_url_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileRequest);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_