Merge 198671 "Try fast-fetch rather than full fetch if drive::Fi..."

chrome/browser/chromeos/drive/file_system.h

Index: chrome/browser/chromeos/drive/file_system.h
===================================================================
--- chrome/browser/chromeos/drive/file_system.h	(revision 199688)
+++ chrome/browser/chromeos/drive/file_system.h	(working copy)
@@ -323,16 +323,20 @@
       FileError error,
       scoped_ptr<ResourceEntry> entry);
 
-  // Part of ReadDirectoryByPath()
-  // 1) Called when ResourceMetadata::GetEntryInfoByPath() is complete.
-  // 2) Called when LoadIfNeeded() is complete.
-  // 3) Called when ResourceMetadata::ReadDirectoryByPath() is complete.
-  // |callback| must not be null.
-  void ReadDirectoryByPathAfterGetEntry(
+  // Loads the entry info of the children of |directory_path| to resource
+  // metadata. |callback| must not be null.
+  void LoadDirectoryIfNeeded(const base::FilePath& directory_path,
+                             const FileOperationCallback& callback);
+  void LoadDirectoryIfNeededAfterGetEntry(
       const base::FilePath& directory_path,
-      const ReadDirectoryWithSettingCallback& callback,
+      const FileOperationCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntry> entry);
+
+  // Part of ReadDirectoryByPath()
+  // 1) Called when LoadDirectoryIfNeeded() is complete.
+  // 2) Called when ResourceMetadata::ReadDirectoryByPath() is complete.
+  // |callback| must not be null.
   void ReadDirectoryByPathAfterLoad(
       const base::FilePath& directory_path,
       const ReadDirectoryWithSettingCallback& callback,