Revert 148990 - gdrive: Get JSON feeds parsing off the UI thread.

chrome/browser/chromeos/gdata/operations_base.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_CHROMEOS_GDATA_OPERATIONS_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_OPERATIONS_BASE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 94 matching lines @@
   // override this method to specify any extra headers needed for the request.
   virtual std::vector<std::string> GetExtraRequestHeaders() const;
   // Used by a derived class to add any content data to the request.
   // Returns true if |upload_content_type| and |upload_content| are updated
   // with the content type and data for the request.
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content);
 
   // Invoked by OnURLFetchComplete when the operation completes without an
   // authentication error. Must be implemented by a derived class.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) = 0;
+  virtual bool ProcessURLFetchResults(const net::URLFetcher* source) = 0;
 
   // Invoked when it needs to notify the status. Chunked operations that
   // constructs a logically single operation from multiple physical operations
   // should notify resume/suspend instead of start/finish.
   virtual void NotifyStartToOperationRegistry();
   virtual void NotifySuccessToOperationRegistry();
 
   // Invoked by this base class upon an authentication error or cancel by
   // an user operation. Must be implemented by a derived class.
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) = 0;
 
   // Implement GDataOperationRegistry::Operation
   virtual void DoCancel() OVERRIDE;
 
   // Overridden from URLFetcherDelegate.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
-  // Invoked when ProcessURLFetchResults() is completed.
-  virtual void OnProcessURLFetchResultsComplete(bool result) OVERRIDE;
-
   // Overridden from GDataOperationInterface.
   virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE;
 
   // Returns an appropriate GDataErrorCode based on the HTTP response code and
   // the status of the URLFetcher.
   GDataErrorCode GetErrorCode(const net::URLFetcher* source) const;
 
   std::string GetResponseHeadersAsString(
       const net::URLFetcher* url_fetcher);
 
@@ skipping 13 matching lines @@
 class EntryActionOperation : public UrlFetchOperationBase {
  public:
   EntryActionOperation(GDataOperationRegistry* registry,
                        Profile* profile,
                        const EntryActionCallback& callback,
                        const GURL& document_url);
   virtual ~EntryActionOperation();
 
  protected:
   // Overridden from UrlFetchOperationBase.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
+  virtual bool ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
   const GURL& document_url() const { return document_url_; }
 
  private:
   EntryActionCallback callback_;
   GURL document_url_;
 
   DISALLOW_COPY_AND_ASSIGN(EntryActionOperation);
 };
 
 //============================== GetDataOperation ==============================
 
 // This class performs the operation for fetching and parsing JSON data content.
 class GetDataOperation : public UrlFetchOperationBase {
  public:
   GetDataOperation(GDataOperationRegistry* registry,
                    Profile* profile,
                    const GetDataCallback& callback);
   virtual ~GetDataOperation();
 
   // Parse GData JSON response.
-  virtual void ParseResponse(GDataErrorCode fetch_error_code,
-                             const std::string& data);
+  virtual base::Value* ParseResponse(const std::string& data);
 
  protected:
   // Overridden from UrlFetchOperationBase.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(
-      GDataErrorCode fetch_error_code) OVERRIDE;
-  void RunCallback(GDataErrorCode fetch_error_code,
-                   scoped_ptr<base::Value> value);
+  virtual bool ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
  private:
-  // Called when ParseJsonOnBlockingPool() is completed.
-  void OnDataParsed(gdata::GDataErrorCode fetch_error_code,
-                    scoped_ptr<base::Value>* value);
-
   GetDataCallback callback_;
-  base::WeakPtrFactory<GetDataOperation> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(GetDataOperation);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_OPERATIONS_BASE_H_