| Index: google_apis/drive/base_requests.h
|
| diff --git a/google_apis/drive/base_requests.h b/google_apis/drive/base_requests.h
|
| index afe12a04fbef7ee5dac09b43bb35c136d16f8323..d9fbfaeb1583cad993888ac91803c2e28012a11e 100644
|
| --- a/google_apis/drive/base_requests.h
|
| +++ b/google_apis/drive/base_requests.h
|
| @@ -29,10 +29,6 @@ namespace google_apis {
|
|
|
| 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;
|
|
|
| @@ -41,12 +37,8 @@ typedef base::Callback<void(
|
| GDataErrorCode error,
|
| scoped_ptr<std::string> content)> GetContentCallback;
|
|
|
| -// 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(base::TaskRunner* blocking_task_runner,
|
| - const std::string& json,
|
| - const ParseJsonCallback& callback);
|
| +// Parses JSON passed in |json|. Returns NULL on failure.
|
| +scoped_ptr<base::Value> ParseJson(const std::string& json);
|
|
|
| //======================= AuthenticatedRequestInterface ======================
|
|
|
|
|