gdata: Add GetEntryInfoByPath() and ReadDirectoryByPath() to GDataDirectoryService

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 1818 matching lines @@
   DCHECK(entry);
 
   scoped_ptr<GDataEntryProto> entry_proto(new GDataEntryProto);
   entry->ToProtoFull(entry_proto.get());
 
   CheckLocalModificationAndRun(entry_proto.Pass(), callback);
 }
 
 void GDataFileSystem::ReadDirectoryByPath(
     const FilePath& file_path,
-    const ReadDirectoryCallback& callback) {
+    const ReadDirectoryWithSettingCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(
       base::Bind(&GDataFileSystem::ReadDirectoryByPathAsyncOnUIThread,
                  ui_weak_ptr_,
                  file_path,
                  CreateRelayCallback(callback)));
 }
 
 void GDataFileSystem::ReadDirectoryByPathAsyncOnUIThread(
     const FilePath& file_path,
-    const ReadDirectoryCallback& callback) {
+    const ReadDirectoryWithSettingCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FindEntryByPathAsyncOnUIThread(
       file_path,
       base::Bind(&GDataFileSystem::OnReadDirectory,
                  ui_weak_ptr_,
                  callback));
 }
 
-void GDataFileSystem::OnReadDirectory(const ReadDirectoryCallback& callback,
-                                      GDataFileError error,
-                                      GDataEntry* entry) {
+void GDataFileSystem::OnReadDirectory(
+    const ReadDirectoryWithSettingCallback& callback,
+    GDataFileError error,
+    GDataEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != GDATA_FILE_OK) {
     if (!callback.is_null())
       callback.Run(error,
                    hide_hosted_docs_,
                    scoped_ptr<GDataEntryProtoVector>());
     return;
   }
   DCHECK(entry);
 
   GDataDirectory* directory = entry->AsGDataDirectory();
   if (!directory) {
     if (!callback.is_null())
       callback.Run(GDATA_FILE_ERROR_NOT_FOUND,
                    hide_hosted_docs_,
                    scoped_ptr<GDataEntryProtoVector>());
     return;
   }
 
-  scoped_ptr<GDataEntryProtoVector> entries(new GDataEntryProtoVector);
-  for (GDataFileCollection::const_iterator iter =
-           directory->child_files().begin();
-       iter != directory->child_files().end(); ++iter) {
-    GDataEntryProto proto;
-    static_cast<const GDataEntry*>(iter->second)->ToProtoFull(&proto);
-    entries->push_back(proto);
-  }
-  for (GDataDirectoryCollection::const_iterator iter =
-           directory->child_directories().begin();
-       iter != directory->child_directories().end(); ++iter) {
-    GDataEntryProto proto;
-    static_cast<const GDataEntry*>(iter->second)->ToProtoFull(&proto);
-    entries->push_back(proto);
-  }
+  scoped_ptr<GDataEntryProtoVector> entries(directory->ToProtoVector());
 
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, hide_hosted_docs_, entries.Pass());
 }
 
 void GDataFileSystem::RequestDirectoryRefresh(const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(
       base::Bind(&GDataFileSystem::RequestDirectoryRefreshOnUIThread,
@@ skipping 1515 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