Remove direct reference to GetBlockingPool() in c/b/google_apis.

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 17 matching lines @@
 
 class RequestSender;
 
 // Callback used to pass parsed JSON from ParseJson(). If parsing error occurs,
 // then the passed argument is null.
 typedef base::Callback<void(scoped_ptr<base::Value> value)> ParseJsonCallback;
 
 // Callback used for DownloadFileRequest and ResumeUploadRequestBase.
 typedef base::Callback<void(int64 progress, int64 total)> ProgressCallback;
 
-// Parses JSON passed in |json| on blocking pool. Runs |callback| on the calling
-// thread when finished with either success or failure.
+// Parses JSON passed in |json| on |blocking_task_runner|. Runs |callback| on
+// the calling thread when finished with either success or failure.
 // The callback must not be null.
-void ParseJson(const std::string& json, const ParseJsonCallback& callback);
+void ParseJson(base::TaskRunner* blocking_task_runner,
+               const std::string& json,
+               const ParseJsonCallback& callback);
 
 //======================= AuthenticatedRequestInterface ======================
 
 // An interface class for implementing a request which requires OAuth2
 // authentication.
 class AuthenticatedRequestInterface {
  public:
   // Called when re-authentication is required. See Start() for details.
   typedef base::Callback<void(AuthenticatedRequestInterface* request)>
       ReAuthenticateCallback;
@@ skipping 87 matching lines @@
   // Invoked when ProcessURLFetchResults() is completed.
   void OnProcessURLFetchResultsComplete(bool result);
 
   // Returns an appropriate GDataErrorCode based on the HTTP response code and
   // the status of the URLFetcher.
   static GDataErrorCode GetErrorCode(const net::URLFetcher* source);
 
   // Returns true if called on the thread where the constructor was called.
   bool CalledOnValidThread();
 
+  // Returns the task runner that should be used for blocking tasks.
+  base::TaskRunner* blocking_task_runner() const;
+
  private:
   // URLFetcherDelegate overrides.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // AuthenticatedRequestInterface overrides.
   virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE;
 
   ReAuthenticateCallback re_authenticate_callback_;
   int re_authenticate_count_;
   scoped_ptr<net::URLFetcher> url_fetcher_;
@@ skipping 10 matching lines @@
 
 //============================ EntryActionRequest ============================
 
 // Callback type for Delete/Move DocumentServiceInterface calls.
 typedef base::Callback<void(GDataErrorCode error)> EntryActionCallback;
 
 // This class performs a simple action over a given entry (document/file).
 // It is meant to be used for requests that return no JSON blobs.
 class EntryActionRequest : public UrlFetchRequestBase {
  public:
-  // |url_request_context_getter| is used to initialize URLFetcher.
-  // |callback| must not be null.
+  // |callback| is called when the request is finished either by success or by
+  // failure. It must not be null.
   EntryActionRequest(RequestSender* sender,
                      const EntryActionCallback& callback);
   virtual ~EntryActionRequest();
 
  protected:
   // Overridden from UrlFetchRequestBase.
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
  private:
   const EntryActionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(EntryActionRequest);
 };
 
 //============================== GetDataRequest ==============================
 
 // Callback type for DocumentServiceInterface::GetResourceList.
 // Note: json_data argument should be passed using base::Passed(&json_data), not
 // json_data.Pass().
 typedef base::Callback<void(GDataErrorCode error,
                             scoped_ptr<base::Value> json_data)> GetDataCallback;
 
 // This class performs the request for fetching and converting the fetched
 // content into a base::Value.
 class GetDataRequest : public UrlFetchRequestBase {
  public:
-  // |callback| must not be null.
+  // |callback| is called when the request finishes either by success or by
+  // failure. On success, a JSON Value object is passed. It must not be null.
   GetDataRequest(RequestSender* sender, const GetDataCallback& callback);
   virtual ~GetDataRequest();
 
   // Parses JSON response.
   void ParseResponse(GDataErrorCode fetch_error_code, const std::string& data);
 
  protected:
   // UrlFetchRequestBase overrides.
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(
@@ skipping 32 matching lines @@
 //
 // Here's the flow of uploading:
 // 1) Get the upload URL with a class inheriting InitiateUploadRequestBase.
 // 2) Upload the first 512KB (see kUploadChunkSize in drive_uploader.cc)
 //    of the target file to the upload URL
 // 3) If there is more data to upload, go to 2).
 //
 class InitiateUploadRequestBase : public UrlFetchRequestBase {
  protected:
   // |callback| will be called with the upload URL, where upload data is
-  // uploaded to with ResumeUploadRequestBase.
-  // |callback| must not be null.
+  // uploaded to with ResumeUploadRequestBase. It must not be null.
   // |content_type| and |content_length| should be the attributes of the
   // uploading file.
   InitiateUploadRequestBase(RequestSender* sender,
                             const InitiateUploadCallback& callback,
                             const std::string& content_type,
                             int64 content_length);
   virtual ~InitiateUploadRequestBase();
 
   // UrlFetchRequestBase overrides.
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
@@ skipping 215 matching lines @@
   const ProgressCallback progress_callback_;
   const GURL download_url_;
   const base::FilePath output_file_path_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileRequestBase);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_