Get rid of RequestRegistry (part 5): each request cancels itself.

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_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/request_registry.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace base {
 class Value;
 }  // namespace base
@@ skipping 45 matching lines @@
   // Invoked when the authentication failed with an error code |code|.
   virtual void OnAuthFailed(GDataErrorCode code) = 0;
 
   // Gets a weak pointer to this request object. Since requests may be
   // deleted when it is canceled by user action, for posting asynchronous tasks
   // on the authentication request object, weak pointers have to be used.
   // TODO(kinaba): crbug.com/134814 use more clean life time management than
   // using weak pointers, while deprecating RequestRegistry.
   virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() = 0;
 
-  // TODO(kinaba): crbug.com/{164089, 231209} This is temporarily added during
-  // migration of cancellation from RequestRegistry to JobScheduler. It should
-  // go away *very soon*.
-  virtual RequestRegistry::Request* AsRequestRegistryRequest() = 0;
+  // Cancels the request. It will invoke the callback object passed in
+  // each request's constructor with error code GDATA_CANCELLED.
+  virtual void Cancel() = 0;
 };
 
 //============================ UrlFetchRequestBase ===========================
 
 // Base class for requests that are fetching URLs.
 class UrlFetchRequestBase : public AuthenticatedRequestInterface,
                             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;
+  virtual void Cancel() OVERRIDE;
 
  protected:
   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
@@ skipping 44 matching lines @@
   }
 
   // By default, no file will be saved. Derived classes can set an output
   // file path in their constructors, if they want to save the downloaded
   // content to a file at a specific path.
   void set_output_file_path(const base::FilePath& output_file_path) {
     output_file_path_ = output_file_path;
   }
 
  private:
-  // RequestRegistry::Request overrides.
-  virtual void DoCancel() OVERRIDE;
-
   // URLFetcherDelegate overrides.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // AuthenticatedRequestInterface overrides.
   virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE;
-  virtual RequestRegistry::Request* AsRequestRegistryRequest() OVERRIDE;
 
   net::URLRequestContextGetter* url_request_context_getter_;
   ReAuthenticateCallback re_authenticate_callback_;
   int re_authenticate_count_;
   scoped_ptr<net::URLFetcher> url_fetcher_;
   bool started_;
 
   bool save_temp_file_;
   base::FilePath output_file_path_;
 
-  // WeakPtrFactory bound to the UI thread.
   // 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<UrlFetchRequestBase> weak_ptr_factory_;
 };
 
 //============================ EntryActionRequest ============================
 
 // Callback type for Delete/Move DocumentServiceInterface calls.
 typedef base::Callback<void(GDataErrorCode error)> EntryActionCallback;
 
@@ skipping 323 matching lines @@
   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_