GDataFileSystem is no longer a friend of GDataDirectory.

chrome/browser/chromeos/gdata/gdata_file_system.h

Index: chrome/browser/chromeos/gdata/gdata_file_system.h
===================================================================
--- chrome/browser/chromeos/gdata/gdata_file_system.h	(revision 151008)
+++ chrome/browser/chromeos/gdata/gdata_file_system.h	(working copy)
@@ -529,11 +529,16 @@
       GDataFileError error,
       const FilePath& moved_file_path);
 
+  // FileMoveCallback for directory changes.
+  void OnDirectoryChangeFileMoveCallback(
+      GDataFileError error,
+      const FilePath& directory_path);
+
   // Callback for GetEntryByResourceIdAsync.
   // Removes stale entry upon upload of file.
-  static void RemoveStaleEntryOnUpload(const std::string& resource_id,
-                                       GDataDirectory* parent_dir,
-                                       GDataEntry* existing_entry);
+  void RemoveStaleEntryOnUpload(const std::string& resource_id,
+                                GDataDirectory* parent_dir,
+                                GDataEntry* existing_entry);
 
   // Converts |entry_value| into GFileDocument instance and adds it
   // to virtual file system at |directory_path|.
@@ -741,11 +746,6 @@
       const FilePath& file_path);
   void OnRequestDirectoryRefresh(GetDocumentsParams* params,
                                  GDataFileError error);
-  void RequestDirectoryRefreshByEntry(
-      const FilePath& directory_path,
-      const std::string& directory_resource_id,
-      const FileResourceIdMap& file_map,
-      GDataEntry* directory_entry);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void AddUploadedFileOnUIThread(UploadMode upload_mode,
                                  const FilePath& virtual_dir_path,