Chromium Code Reviews| Index: chrome/browser/chromeos/drive/stale_cache_files_remover.cc |
| diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc |
| index aedf7b638da44cd11c0b19464e0751ce7a406f20..11d4ca9cbad094bd90dd34a49413bd4165ab21d5 100644 |
| --- a/chrome/browser/chromeos/drive/stale_cache_files_remover.cc |
| +++ b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc |
| @@ -13,7 +13,7 @@ |
| using content::BrowserThread; |
| -namespace gdata { |
| +namespace drive { |
| namespace { |
| @@ -21,7 +21,7 @@ namespace { |
| void EmitErrorLog(DriveFileError error, |
| const std::string& resource_id, |
| const std::string& md5) { |
| - if (error != gdata::DRIVE_FILE_OK) { |
| + if (error != DRIVE_FILE_OK) { |
| LOG(WARNING) << "Failed to remove a stale cache file. resource_id:" |
| << resource_id; |
| } |
| @@ -45,7 +45,7 @@ StaleCacheFilesRemover::~StaleCacheFilesRemover() { |
| void StaleCacheFilesRemover::OnInitialLoadFinished(DriveFileError error) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| - const FilePath root_path = FilePath(gdata::kDriveRootDirectory); |
| + const FilePath root_path = FilePath(kDriveRootDirectory); |
| cache_->GetResourceIdsOfAllFilesOnUIThread( |
| base::Bind(&StaleCacheFilesRemover::OnGetResourceIdsOfAllFiles, |
| weak_ptr_factory_.GetWeakPtr())); |
| @@ -70,7 +70,7 @@ void StaleCacheFilesRemover::OnGetResourceIdsOfAllFiles( |
| void StaleCacheFilesRemover::GetEntryInfoAndRemoveCacheIfNecessary( |
| const std::string& resource_id, |
| bool success, |
| - const gdata::DriveCacheEntry& cache_entry) { |
| + const DriveCacheEntry& cache_entry) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| // Removes the cache if GetCacheEntryOnUIThread() failed. |
| @@ -92,11 +92,11 @@ void StaleCacheFilesRemover::RemoveCacheIfNecessary( |
| const std::string& cache_md5, |
| DriveFileError error, |
| const FilePath& drive_file_path, |
| - scoped_ptr<gdata::DriveEntryProto> entry_proto) { |
| + scoped_ptr<drive::DriveEntryProto> entry_proto) { |
|
hashimoto
2012/10/12 04:57:46
nit: No need to have 'drive'?
satorux1
2012/10/12 05:32:56
Done.
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| // The entry is not found in the file system. |
| - if (error != gdata::DRIVE_FILE_OK) { |
| + if (error != DRIVE_FILE_OK) { |
| cache_->RemoveOnUIThread(resource_id, base::Bind(&EmitErrorLog)); |
| return; |
| } |
| @@ -110,4 +110,4 @@ void StaleCacheFilesRemover::RemoveCacheIfNecessary( |
| } |
| } |
| -} // namespace gdata |
| +} // namespace drive |