gdata: Use GDataDirectoryService::GetEntryInfoByPath()

chrome/browser/chromeos/gdata/gdata_file_system.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/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 707 matching lines @@
       GetDownloadDataCallback());
 }
 
 void GDataFileSystem::TransferFileFromLocalToRemote(
     const FilePath& local_src_file_path,
     const FilePath& remote_dest_file_path,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Make sure the destination directory exists.
-  GetEntryInfoByPath(
+  directory_service_->GetEntryInfoByPath(
       remote_dest_file_path.DirName(),
       base::Bind(
           &GDataFileSystem::TransferFileFromLocalToRemoteAfterGetEntryInfo,
           ui_weak_ptr_,
           local_src_file_path,
           remote_dest_file_path,
           callback));
 }
 
 void GDataFileSystem::TransferFileFromLocalToRemoteAfterGetEntryInfo(
@@ skipping 103 matching lines @@
   DCHECK(content_type);
 
   if (*error != GDATA_FILE_OK) {
     if (!params.callback.is_null())
       params.callback.Run(*error);
 
     return;
   }
 
   // Make sure the destination directory exists.
-  GetEntryInfoByPath(
+  directory_service_->GetEntryInfoByPath(
       params.remote_file_path.DirName(),
       base::Bind(
           &GDataFileSystem::StartFileUploadOnUIThreadAfterGetEntryInfo,
           ui_weak_ptr_,
           params,
           *file_size,
           *content_type));
 }
 
 void GDataFileSystem::StartFileUploadOnUIThreadAfterGetEntryInfo(
@@ skipping 210 matching lines @@
   // It is a no-op if the file is renamed to the same name.
   if (file_path.BaseName().value() == new_name) {
     if (!callback.is_null()) {
       MessageLoop::current()->PostTask(
           FROM_HERE, base::Bind(callback, GDATA_FILE_OK, file_path));
     }
     return;
   }
 
   // Get the edit URL of an entry at |file_path|.
-  GetEntryInfoByPath(file_path,
-                     base::Bind(
-                         &GDataFileSystem::RenameAfterGetEntryInfo,
-                         ui_weak_ptr_,
-                         file_path,
-                         new_name,
-                         callback));
+  directory_service_->GetEntryInfoByPath(
+      file_path,
+      base::Bind(
+          &GDataFileSystem::RenameAfterGetEntryInfo,
+          ui_weak_ptr_,
+          file_path,
+          new_name,
+          callback));
 }
 
 void GDataFileSystem::RenameAfterGetEntryInfo(
     const FilePath& file_path,
     const FilePath::StringType& new_name,
     const FilePathUpdateCallback& callback,
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 190 matching lines @@
                                CreateRelayCallback(callback)));
 }
 
 void GDataFileSystem::RemoveOnUIThread(
     const FilePath& file_path,
     bool is_recursive,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Get the edit URL of an entry at |file_path|.
-  GetEntryInfoByPath(file_path,
-                     base::Bind(
-                         &GDataFileSystem::RemoveOnUIThreadAfterGetEntryInfo,
-                         ui_weak_ptr_,
-                         file_path,
-                         is_recursive,
-                         callback));
+  directory_service_->GetEntryInfoByPath(
+      file_path,
+      base::Bind(
+          &GDataFileSystem::RemoveOnUIThreadAfterGetEntryInfo,
+          ui_weak_ptr_,
+          file_path,
+          is_recursive,
+          callback));
 }
 
 void GDataFileSystem::RemoveOnUIThreadAfterGetEntryInfo(
     const FilePath& file_path,
     bool /* is_recursive */,
     const FileOperationCallback& callback,
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 177 matching lines @@
                  CreateRelayCallback(get_file_callback),
                  CreateRelayCallback(get_download_data_callback)));
 }
 
 void GDataFileSystem::GetFileByPathOnUIThread(
     const FilePath& file_path,
     const GetFileCallback& get_file_callback,
     const GetDownloadDataCallback& get_download_data_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  GetEntryInfoByPath(
+  directory_service_->GetEntryInfoByPath(
       file_path,
       base::Bind(&GDataFileSystem::OnGetEntryInfoCompleteForGetFileByPath,
                  ui_weak_ptr_,
                  file_path,
                  CreateRelayCallback(get_file_callback),
                  CreateRelayCallback(get_download_data_callback)));
 }
 
 void GDataFileSystem::OnGetEntryInfoCompleteForGetFileByPath(
     const FilePath& file_path,
@@ skipping 380 matching lines @@
       base::Bind(&GDataFileSystem::RequestDirectoryRefreshOnUIThread,
                  ui_weak_ptr_,
                  file_path));
 }
 
 void GDataFileSystem::RequestDirectoryRefreshOnUIThread(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Make sure the destination directory exists.
-  GetEntryInfoByPath(
+  directory_service_->GetEntryInfoByPath(
       file_path,
       base::Bind(
           &GDataFileSystem::RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo,
           ui_weak_ptr_,
           file_path));
 }
 
 void GDataFileSystem::RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo(
     const FilePath& file_path,
     GDataFileError error,
@@ skipping 1096 matching lines @@
   // Open->Open->modify->Close->modify->Close; the second modify may not be
   // synchronized to the server since it is already Closed on the cache).
   if (open_files_.find(file_path) != open_files_.end()) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, GDATA_FILE_ERROR_IN_USE, FilePath()));
     return;
   }
   open_files_.insert(file_path);
 
-  GetEntryInfoByPath(
+  directory_service_->GetEntryInfoByPath(
       file_path,
       base::Bind(&GDataFileSystem::OnGetEntryInfoCompleteForOpenFile,
                  ui_weak_ptr_,
                  file_path,
                  base::Bind(&GDataFileSystem::OnOpenFileFinished,
                             ui_weak_ptr_,
                             file_path,
                             callback)));
 }
 
@@ skipping 378 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata