| Index: chrome/browser/google_apis/operations_base.cc
|
| diff --git a/chrome/browser/google_apis/operations_base.cc b/chrome/browser/google_apis/operations_base.cc
|
| index 82cd2ee296142e16faecda6c6e002b680889cd41..6574f635286ca39f86bad88f4dd5d1ce293a6a8a 100644
|
| --- a/chrome/browser/google_apis/operations_base.cc
|
| +++ b/chrome/browser/google_apis/operations_base.cc
|
| @@ -109,7 +109,7 @@ void AuthOperation::OnGetTokenSuccess(const std::string& access_token,
|
| kSuccessRatioHistogramMaxValue);
|
|
|
| callback_.Run(HTTP_SUCCESS, access_token);
|
| - NotifyFinish(OperationRegistry::OPERATION_COMPLETED);
|
| + NotifyFinish(OPERATION_COMPLETED);
|
| }
|
|
|
| // Callback for OAuth2AccessTokenFetcher on failure.
|
| @@ -133,7 +133,7 @@ void AuthOperation::OnGetTokenFailure(const GoogleServiceAuthError& error) {
|
| kSuccessRatioHistogramMaxValue);
|
| callback_.Run(HTTP_UNAUTHORIZED, std::string());
|
| }
|
| - NotifyFinish(OperationRegistry::OPERATION_FAILED);
|
| + NotifyFinish(OPERATION_FAILED);
|
| }
|
|
|
| //============================ UrlFetchOperationBase ===========================
|
| @@ -145,10 +145,9 @@ UrlFetchOperationBase::UrlFetchOperationBase(OperationRegistry* registry)
|
| started_(false) {
|
| }
|
|
|
| -UrlFetchOperationBase::UrlFetchOperationBase(
|
| - OperationRegistry* registry,
|
| - OperationRegistry::OperationType type,
|
| - const FilePath& path)
|
| +UrlFetchOperationBase::UrlFetchOperationBase(OperationRegistry* registry,
|
| + OperationType type,
|
| + const FilePath& path)
|
| : OperationRegistry::Operation(registry, type, path),
|
| re_authenticate_count_(0),
|
| save_temp_file_(false) {
|
| @@ -245,7 +244,7 @@ void UrlFetchOperationBase::OnProcessURLFetchResultsComplete(bool result) {
|
| if (result)
|
| NotifySuccessToOperationRegistry();
|
| else
|
| - NotifyFinish(OperationRegistry::OPERATION_FAILED);
|
| + NotifyFinish(OPERATION_FAILED);
|
| }
|
|
|
| void UrlFetchOperationBase::OnURLFetchComplete(const URLFetcher* source) {
|
| @@ -268,7 +267,7 @@ void UrlFetchOperationBase::OnURLFetchComplete(const URLFetcher* source) {
|
| }
|
|
|
| void UrlFetchOperationBase::NotifySuccessToOperationRegistry() {
|
| - NotifyFinish(OperationRegistry::OPERATION_COMPLETED);
|
| + NotifyFinish(OPERATION_COMPLETED);
|
| }
|
|
|
| void UrlFetchOperationBase::NotifyStartToOperationRegistry() {
|
| @@ -290,7 +289,7 @@ void UrlFetchOperationBase::OnAuthFailed(GDataErrorCode code) {
|
| // and notifications. Once NotifyFinish() is called, the current instance of
|
| // gdata operation will be deleted from the OperationRegistry and become
|
| // invalid.
|
| - NotifyFinish(OperationRegistry::OPERATION_FAILED);
|
| + NotifyFinish(OPERATION_FAILED);
|
| }
|
|
|
| std::string UrlFetchOperationBase::GetResponseHeadersAsString(
|
|
|