drive: Rename FileCache methods in a blocking pool centric manner

chrome/browser/chromeos/drive/sync_client.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/sync_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
@@ skipping 62 matching lines @@
 
   file_system_->RemoveObserver(this);
   cache_->RemoveObserver(this);
 }
 
 void SyncClient::StartProcessingBacklog() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::vector<std::string>* to_fetch = new std::vector<std::string>;
   std::vector<std::string>* to_upload = new std::vector<std::string>;
-  cache_->Iterate(base::Bind(&CollectBacklog, to_fetch, to_upload),
-                  base::Bind(&SyncClient::OnGetResourceIdsOfBacklog,
-                             weak_ptr_factory_.GetWeakPtr(),
-                             base::Owned(to_fetch),
-                             base::Owned(to_upload)));
+  cache_->IterateOnUIThread(base::Bind(&CollectBacklog, to_fetch, to_upload),
+                            base::Bind(&SyncClient::OnGetResourceIdsOfBacklog,
+                                       weak_ptr_factory_.GetWeakPtr(),
+                                       base::Owned(to_fetch),
+                                       base::Owned(to_upload)));
 }
 
 void SyncClient::StartCheckingExistingPinnedFiles() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  cache_->Iterate(
+  cache_->IterateOnUIThread(
       base::Bind(&SyncClient::OnGetResourceIdOfExistingPinnedFile,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&base::DoNothing));
 }
 
 std::vector<std::string> SyncClient::GetResourceIdsForTesting(
     SyncType sync_type) const {
   switch (sync_type) {
     case FETCH:
       return std::vector<std::string>(fetch_list_.begin(), fetch_list_.end());
@@ skipping 151 matching lines @@
   if (error != FILE_ERROR_OK) {
     LOG(WARNING) << "Entry not found: " << resource_id;
     return;
   }
 
   // If MD5s don't match, it indicates the local cache file is stale, unless
   // the file is dirty (the MD5 is "local"). We should never re-fetch the
   // file when we have a locally modified version.
   if (entry->file_specific_info().file_md5() != cache_entry.md5() &&
       !cache_entry.is_dirty()) {
-    cache_->Remove(resource_id,
-                   base::Bind(&SyncClient::OnRemove,
-                              weak_ptr_factory_.GetWeakPtr(),
-                              resource_id));
+    cache_->RemoveOnUIThread(resource_id,
+                             base::Bind(&SyncClient::OnRemove,
+                                        weak_ptr_factory_.GetWeakPtr(),
+                                        resource_id));
   }
 }
 
 void SyncClient::OnRemove(const std::string& resource_id,
                           FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != FILE_ERROR_OK) {
     LOG(WARNING) << "Failed to remove cache entry: " << resource_id;
     return;
   }
 
   // Before fetching, we should pin this file again, so that the fetched file
   // is downloaded properly to the persistent directory and marked pinned.
-  cache_->Pin(resource_id,
-              std::string(),
-              base::Bind(&SyncClient::OnPinned,
-                         weak_ptr_factory_.GetWeakPtr(),
-                         resource_id));
+  cache_->PinOnUIThread(resource_id,
+                        std::string(),
+                        base::Bind(&SyncClient::OnPinned,
+                                   weak_ptr_factory_.GetWeakPtr(),
+                                   resource_id));
 }
 
 void SyncClient::OnPinned(const std::string& resource_id,
                           FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != FILE_ERROR_OK) {
     LOG(WARNING) << "Failed to pin cache entry: " << resource_id;
     return;
   }
@@ skipping 35 matching lines @@
   if (error == FILE_ERROR_OK) {
     DVLOG(1) << "Uploaded " << resource_id;
   } else {
     // TODO(satorux): We should re-queue if the error is recoverable.
     LOG(WARNING) << "Failed to upload " << resource_id << ": "
                  << FileErrorToString(error);
   }
 }
 
 }  // namespace drive