gdata: Make RemoveEntry/TakeEntry/TakeOverEntries private

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 387 matching lines @@
                      const base::Closure& task) {
   if (relay_proxy->BelongsToCurrentThread()) {
     task.Run();
   } else {
     const bool posted = relay_proxy->PostTask(FROM_HERE, task);
     DCHECK(posted);
   }
 }
 
 // Callback for GetEntryByResourceIdAsync.
-// Removes stale entry upon upload of file.
-void RemoveStaleEntryOnUpload(const std::string& resource_id,
-                              GDataDirectory* parent_dir,
-                              GDataEntry* existing_entry) {
-  if (existing_entry &&
-      // This should always match, but just in case.
-      existing_entry->parent() == parent_dir) {
-    parent_dir->RemoveEntry(existing_entry);
-  } else {
-    LOG(ERROR) << "Entry for the existing file not found: " << resource_id;
-  }
-}
-
-// Callback for GetEntryByResourceIdAsync.
 // Adds |entry| to |results|. Runs |callback| with |results| when
 // |run_callback| is true.
 void AddEntryToSearchResults(
     std::vector<SearchResultInfo>* results,
     const SearchCallback& callback,
     GDataFileError error,
     bool run_callback,
     GDataEntry* entry) {
   // If a result is not present in our local file system snapshot, ignore it.
   // For example, this may happen if the entry has recently been added to the
@@ skipping 3012 matching lines @@
   DCHECK(file_map->empty());
 
   if (should_notify_directory_changed) {
     for (std::set<FilePath>::iterator dir_iter = changed_dirs.begin();
         dir_iter != changed_dirs.end(); ++dir_iter) {
       NotifyDirectoryChanged(*dir_iter);
     }
   }
 }
 
-// Helper function for adding new |file| from the feed into |directory|. It
-// checks the type of file and updates |changed_dirs| if this file adding
-// operation needs to raise directory notification update. If file is being
-// added to |orphaned_dir_service| such notifications are not raised since
-// we ignore such files and don't add them to the file system now.
 // static
 void GDataFileSystem::AddEntryToDirectoryAndCollectChangedDirectories(
     GDataEntry* entry,
     GDataDirectory* directory,
     GDataDirectoryService* orphaned_dir_service,
     std::set<FilePath>* changed_dirs) {
   directory->AddEntry(entry);
   if (entry->AsGDataDirectory() && directory != orphaned_dir_service->root())
     changed_dirs->insert(entry->GetFilePath());
 }
 
-// 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
 void GDataFileSystem::RemoveEntryFromDirectoryAndCollectChangedDirectories(
     GDataDirectory* directory,
     GDataEntry* entry,
     std::set<FilePath>* changed_dirs) {
   // Get the list of all sub-directory paths, so we can notify their listeners
   // that they are smoked.
   GetChildDirectoryPaths(entry, changed_dirs);
   directory->RemoveEntry(entry);
 }
 
+// static
+void GDataFileSystem::RemoveStaleEntryOnUpload(const std::string& resource_id,
+                                               GDataDirectory* parent_dir,
+                                               GDataEntry* existing_entry) {
+  if (existing_entry &&
+      // This should always match, but just in case.
+      existing_entry->parent() == parent_dir) {
+    parent_dir->RemoveEntry(existing_entry);
+  } else {
+    LOG(ERROR) << "Entry for the existing file not found: " << resource_id;
+  }
+}
+
 GDataDirectory* GDataFileSystem::FindDirectoryForNewEntry(
     GDataEntry* new_entry,
     const FileResourceIdMap& file_map,
     GDataDirectoryService* orphaned_dir_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GDataDirectory* dir = NULL;
   // Added file.
   const std::string& parent_id = new_entry->parent_resource_id();
   if (parent_id.empty()) {
     dir = directory_service_->root();
@@ skipping 775 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