| Index: chrome/browser/chromeos/drive/file_system/remove_operation.cc
|
| diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
|
| index e9eec583672b3aaab43300cb3409ba574b1b3013..6eafcf8acb284b2a65a6932be615fe303e7ea446 100644
|
| --- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc
|
| +++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
|
| @@ -16,7 +16,7 @@
|
|
|
| using content::BrowserThread;
|
|
|
| -namespace gdata {
|
| +namespace drive {
|
|
|
| namespace {
|
| int kMaxRetries = 5;
|
| @@ -92,14 +92,14 @@ void RemoveOperation::RetryIfNeeded(
|
| const FileOperationCallback& callback,
|
| int retry_count,
|
| scoped_ptr<DriveEntryProto> entry_proto,
|
| - GDataErrorCode status,
|
| + gdata::GDataErrorCode status,
|
| const GURL& /* document_url */) {
|
| // If the call failed due to flooding the server, and we haven't hit the
|
| // maximum number of retries, throttle and retry.
|
| //
|
| // TODO(zork): Move this retry logic into the scheduler when it is completed.
|
| - if ((status == HTTP_SERVICE_UNAVAILABLE ||
|
| - status == HTTP_INTERNAL_SERVER_ERROR) &&
|
| + if ((status == gdata::HTTP_SERVICE_UNAVAILABLE ||
|
| + status == gdata::HTTP_INTERNAL_SERVER_ERROR) &&
|
| retry_count < kMaxRetries) {
|
| base::TimeDelta delay =
|
| base::TimeDelta::FromSeconds(pow(2, retry_count)) +
|
| @@ -126,7 +126,7 @@ void RemoveOperation::RetryIfNeeded(
|
| void RemoveOperation::RemoveResourceLocally(
|
| const FileOperationCallback& callback,
|
| const std::string& resource_id,
|
| - GDataErrorCode status) {
|
| + gdata::GDataErrorCode status) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -157,4 +157,4 @@ void RemoveOperation::NotifyDirectoryChanged(
|
| }
|
|
|
| } // namespace file_system
|
| -} // namespace gdata
|
| +} // namespace drive
|
|
|