gdata: Make RemoveEntry/TakeEntry/TakeOverEntries private

chrome/browser/chromeos/gdata/gdata_file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 539 matching lines @@
 
   // Helper function for removing |entry| from |directory|. If |entry| is a
   // directory too, it will collect all its children file paths into
   // |changed_dirs| as well.
   // static
   static void RemoveEntryFromDirectoryAndCollectChangedDirectories(
       GDataDirectory* directory,
       GDataEntry* entry,
       std::set<FilePath>* changed_dirs);
 
+  // Callback for GetEntryByResourceIdAsync.
+  // Removes stale entry upon upload of file.
+  static void RemoveStaleEntryOnUpload(const std::string& resource_id,
+                                       GDataDirectory* parent_dir,
+                                       GDataEntry* existing_entry);
+
   // Finds directory where new |file| should be added to during feed processing.
   // |orphaned_entries_dir| collects files/dirs that don't have a parent in
   // either locally cached file system or in this new feed.
   GDataDirectory* FindDirectoryForNewEntry(
       GDataEntry* new_entry,
       const FileResourceIdMap& file_map,
       GDataDirectoryService* orphaned_entries);
 
   // Converts list of document feeds from collected feeds into
   // FileResourceIdMap.
@@ skipping 360 matching lines @@
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 
   ObserverList<Observer> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_