Parent/child fixes.

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 <errno.h>
 #include <sys/stat.h>
 
 #include <set>
@@ skipping 36 matching lines @@
 #include "net/url_request/url_request_filter.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 namespace {
 
 const char kMimeTypeJson[] = "application/json";
 const char kMimeTypeOctetStream[] = "application/octet-stream";
 
-const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("gdata");
 const char kWildCard[] = "*";
 const char kLocallyModifiedFileExtension[] = "local";
 const char kMountedArchiveFileExtension[] = "mounted";
 
 const FilePath::CharType kGDataCacheVersionDir[] = FILE_PATH_LITERAL("v1");
 const FilePath::CharType kGDataCacheMetaDir[] = FILE_PATH_LITERAL("meta");
 const FilePath::CharType kGDataCachePinnedDir[] = FILE_PATH_LITERAL("pinned");
 const FilePath::CharType kGDataCacheOutgoingDir[] =
     FILE_PATH_LITERAL("outgoing");
 const FilePath::CharType kGDataCachePersistentDir[] =
@@ skipping 340 matching lines @@
   }
 }
 
 // Recursively extracts the paths set of all sub-directories of |entry|.
 void GetChildDirectoryPaths(GDataEntry* entry,
                             std::set<FilePath>* changed_dirs) {
   GDataDirectory* dir = entry->AsGDataDirectory();
   if (!dir)
     return;
 
-  for (GDataFileCollection::const_iterator it = dir->children().begin();
-       it != dir->children().end(); ++it) {
-    GDataDirectory* child_dir = it->second->AsGDataDirectory();
-    if (child_dir) {
-      changed_dirs->insert(child_dir->GetFilePath());
-      GetChildDirectoryPaths(child_dir, changed_dirs);
-    }
+  for (GDataDirectoryCollection::const_iterator it =
+       dir->child_directories().begin();
+       it != dir->child_directories().end(); ++it) {
+    GDataDirectory* child_dir = it->second;
+    changed_dirs->insert(child_dir->GetFilePath());
+    GetChildDirectoryPaths(child_dir, changed_dirs);
   }
 }
 
 
 // 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.
 void RemoveEntryFromDirectoryAndCollectChangedDirectories(
     GDataDirectory* directory,
     GDataEntry* entry,
@@ skipping 476 matching lines @@
 
   FilePath cache_base_path;
   chrome::GetUserCacheDirectory(profile_->GetPath(), &cache_base_path);
   gdata_cache_path_ = cache_base_path.Append(chrome::kGDataCacheDirname);
   gdata_cache_path_ = gdata_cache_path_.Append(kGDataCacheVersionDir);
   SetCachePaths(gdata_cache_path_);
 
   documents_service_->Initialize(profile_);
 
   root_.reset(new GDataRootDirectory);
-  root_->set_file_name(kGDataRootDirectory);
 
   PrefService* pref_service = profile_->GetPrefs();
   hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableGDataHostedFiles);
 
   InitializePreferenceObserver();
 }
 
 bool GDataFileSystem::SetCacheRootPathForTesting(const FilePath& root_path) {
   if (cache_initialization_started_)
     return false;
@@ skipping 1936 matching lines @@
   base::AutoLock lock(lock_);
   GDataEntry* entry = GetGDataEntryByPath(file_path);
   if (!entry)
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   DCHECK(entry->parent());
   entry->set_title(new_name);
   // After changing the title of the entry, call TakeFile() to remove the
   // entry from its parent directory and then add it back in order to go
   // through the file name de-duplication.
+  // TODO(achuith/satorux/zel): This code is fragile. The title has been
+  // changed, but not the file_name. TakeEntry removes the child based on the
+  // old file_name, and then re-adds the child by first assigning the new title
+  // to file_name. http://crbug.com/30157
   if (!entry->parent()->TakeEntry(entry))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   *updated_file_path = entry->GetFilePath();
 
   NotifyDirectoryChanged(updated_file_path->DirName());
   return base::PLATFORM_FILE_OK;
 }
 
 base::PlatformFileError GDataFileSystem::AddEntryToDirectoryOnFilesystem(
@@ skipping 1692 matching lines @@
   pref_registrar_->Init(profile_->GetPrefs());
   pref_registrar_->Add(prefs::kDisableGDataHostedFiles, this);
 }
 
 void SetFreeDiskSpaceGetterForTesting(FreeDiskSpaceGetterInterface* getter) {
   delete global_free_disk_getter_for_testing;  // Safe to delete NULL;
   global_free_disk_getter_for_testing = getter;
 }
 
 }  // namespace gdata