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

chrome/browser/chromeos/gdata/gdata_operations.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_GDATA_OPERATIONS_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATIONS_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 173 matching lines @@
 
 // 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 bool ParseResponse(GDataErrorCode fetch_error_code,
-                             const std::string& data);
+  virtual base::Value* ParseResponse(const std::string& data);
 
  protected:
   // Overridden from UrlFetchOperationBase.
   virtual bool 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 void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
 
  private:
-  void OnDataParsed(GDataErrorCode fetch_error_code,
-                    scoped_ptr<base::Value>* value);
-
   GetDataCallback callback_;
-  base::WeakPtrFactory<GetDataOperation> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(GetDataOperation);
 };
 
 //============================ GetDocumentsOperation ===========================
 
 // This class performs the operation for fetching a document list.
 class GetDocumentsOperation : public GetDataOperation {
  public:
   GetDocumentsOperation(GDataOperationRegistry* registry,
                         Profile* profile,
@@ skipping 220 matching lines @@
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
   // Overridden from GetDataOperation.
   virtual GURL GetURL() const OVERRIDE;
   virtual bool ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
 
   // Must override GetDataOperation's ParseResponse because the response is XML
   // not JSON.
-  virtual bool ParseResponse(GDataErrorCode code,
-                             const std::string& data) OVERRIDE;
+  virtual base::Value* ParseResponse(const std::string& data) OVERRIDE;
  private:
   std::string app_id_;
   GURL document_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AuthorizeAppsOperation);
 };
 
 //======================= AddResourceToDirectoryOperation ======================
 
 // This class performs the operation for adding a document/file/directory
@@ skipping 116 matching lines @@
   ResumeUploadCallback callback_;
   ResumeUploadParams params_;
   bool last_chunk_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(ResumeUploadOperation);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATIONS_H_